diff --git a/commit_queue.py b/commit_queue.py index 3f4e7b68d..d23cbd1ac 100755 --- a/commit_queue.py +++ b/commit_queue.py @@ -110,7 +110,8 @@ def gen_parser(): """ parser = optparse.OptionParser(version=__version__) # Remove description formatting - parser.format_description = lambda x: parser.description + parser.format_description = ( + lambda _: parser.description) # pylint: disable=E1101 # Add common parsing. old_parser_args = parser.parse_args diff --git a/my_reviews.py b/my_reviews.py index 47db1da21..fc18b3565 100755 --- a/my_reviews.py +++ b/my_reviews.py @@ -302,7 +302,8 @@ def main(): default='http://codereview.chromium.org', help='Host to use, default is %default') # Remove description formatting - parser.format_description = lambda x: parser.description + parser.format_description = ( + lambda _: parser.description) # pylint: disable=E1101 options, args = parser.parse_args() if args: parser.error('Args unsupported') diff --git a/subprocess2.py b/subprocess2.py index e65186e76..99eebcc1a 100644 --- a/subprocess2.py +++ b/subprocess2.py @@ -182,7 +182,8 @@ class Popen(subprocess.Popen): fix('stderr') self.start = time.time() - + # Silence pylint on MacOSX + self.returncode = None try: super(Popen, self).__init__(args, **kwargs) except OSError, e: diff --git a/testing_support/fake_repos.py b/testing_support/fake_repos.py index a5af11fe3..8bc4547dd 100755 --- a/testing_support/fake_repos.py +++ b/testing_support/fake_repos.py @@ -124,7 +124,7 @@ def wait_for_port_to_bind(host, port, process): # immediately, it fails with EINVAL and never gets a chance to # connect (putting us into a hard spin and then failing). # Linux doesn't need this. - time.sleep(0.1) + time.sleep(0.2) try: start = datetime.datetime.utcnow() diff --git a/tests/subprocess2_test.py b/tests/subprocess2_test.py index b0706aeb2..10290592d 100755 --- a/tests/subprocess2_test.py +++ b/tests/subprocess2_test.py @@ -125,9 +125,6 @@ class DefaultsTest(auto_stub.TestCase): # Cleanup code in subprocess.py needs this member to be set. # pylint: disable=W0201 proc._child_created = None - # Since subprocess.Popen.__init__() is not called, proc.returncode shouldn't - # be present. - self.assertFalse(hasattr(proc, 'returncode')) expected = { 'args': ['foo'], 'a': True,