launchpad-reviewers team mailing list archive

[Colin Watson <mp+410818@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:flake8-misc into lp-codeimport:master.

Commit message:
Fix/ignore an assortment of flake8 violations

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/410818
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:flake8-misc into lp-codeimport:master.

diff --git a/cronscripts/code-import-dispatcher.py b/cronscripts/code-import-dispatcher.py
index 1225de7..2810356 100755
--- a/cronscripts/code-import-dispatcher.py
+++ b/cronscripts/code-import-dispatcher.py
@@ -5,7 +5,7 @@
 
 """Look for and dispatch code import jobs as needed."""
 
-import _pythonpath
+import _pythonpath  # noqa: F401
 
 from six.moves.xmlrpc_client import ServerProxy
 
@@ -42,4 +42,3 @@ class CodeImportDispatcherScript(LaunchpadScript):
 if __name__ == '__main__':
     script = CodeImportDispatcherScript("codeimportdispatcher")
     script.lock_and_run()
-
diff --git a/lib/devscripts/tests/test_sourcecode.py b/lib/devscripts/tests/test_sourcecode.py
index 6b538c7..ef03676 100644
--- a/lib/devscripts/tests/test_sourcecode.py
+++ b/lib/devscripts/tests/test_sourcecode.py
@@ -112,7 +112,7 @@ class TestInterpretConfiguration(unittest.TestCase):
         config = interpret_config([['key', 'value;revno=45']], False)
         self.assertEqual({'key': ('value', '45', False)}, config)
 
-    def test_key_value_revision(self):
+    def test_key_value_revision_with_multiple_revnos_raises_error(self):
         # A (key, value) pair without a third optional value when the
         # value has multiple suffixes of ``;revno=[REVISION]`` raises an
         # error.
diff --git a/lib/lp/app/__init__.py b/lib/lp/app/__init__.py
index 18e4d98..ae29a56 100644
--- a/lib/lp/app/__init__.py
+++ b/lib/lp/app/__init__.py
@@ -14,4 +14,4 @@ __all__ = []
 
 # Load versioninfo.py so that we get errors on start-up rather than waiting
 # for first page load.
-import lp.app.versioninfo
+import lp.app.versioninfo  # noqa: F401
diff --git a/lib/lp/codehosting/__init__.py b/lib/lp/codehosting/__init__.py
index 47ccbcb..2a20dfa 100644
--- a/lib/lp/codehosting/__init__.py
+++ b/lib/lp/codehosting/__init__.py
@@ -24,7 +24,7 @@ from lp.services.config import config
 if six.PY2:
     from bzrlib.plugin import load_plugins as bzr_load_plugins
     # This import is needed so that bzr's logger gets registered.
-    import bzrlib.trace
+    import bzrlib.trace  # noqa: F401
 
 
 def _get_bzr_plugins_path():
diff --git a/lib/lp/codehosting/codeimport/tests/servers.py b/lib/lp/codehosting/codeimport/tests/servers.py
index e3c3ae2..06ad6c1 100644
--- a/lib/lp/codehosting/codeimport/tests/servers.py
+++ b/lib/lp/codehosting/codeimport/tests/servers.py
@@ -155,7 +155,7 @@ class SubversionServer(Server):
                         raise
                     else:
                         break
-                except Exception as e:
+                except Exception:
                     self._kill_svnserve()
                     raise
             else:
diff --git a/lib/lp/codehosting/codeimport/tests/test_worker.py b/lib/lp/codehosting/codeimport/tests/test_worker.py
index a26ea5e..b483504 100644
--- a/lib/lp/codehosting/codeimport/tests/test_worker.py
+++ b/lib/lp/codehosting/codeimport/tests/test_worker.py
@@ -66,7 +66,7 @@ from testtools.matchers import (
     LessThan,
     )
 
-import lp.codehosting
+import lp.codehosting  # noqa: F401
 from lp.codehosting.codeimport.tarball import (
     create_tarball,
     extract_tarball,
diff --git a/lib/lp/codehosting/codeimport/worker.py b/lib/lp/codehosting/codeimport/worker.py
index 40a7f1e..4b6dbe7 100644
--- a/lib/lp/codehosting/codeimport/worker.py
+++ b/lib/lp/codehosting/codeimport/worker.py
@@ -30,7 +30,7 @@ import subprocess
 
 # FIRST Ensure correct plugins are loaded. Do not delete this comment or the
 # line below this comment.
-import lp.codehosting
+import lp.codehosting  # noqa: F401
 
 from bzrlib.branch import (
     Branch,
diff --git a/lib/lp/scripts/utilities/importpedant.py b/lib/lp/scripts/utilities/importpedant.py
index bf7cba0..eac533f 100644
--- a/lib/lp/scripts/utilities/importpedant.py
+++ b/lib/lp/scripts/utilities/importpedant.py
@@ -7,6 +7,7 @@ import atexit
 import itertools
 from operator import attrgetter
 import types
+import warnings
 
 import six
 from six.moves import builtins
@@ -16,7 +17,6 @@ original_import = builtins.__import__
 naughty_imports = set()
 
 # Silence bogus warnings from Hardy's python-pkg-resources package.
-import warnings
 warnings.filterwarnings('ignore', category=UserWarning, append=True,
                         message=r'Module .*? is being added to sys.path')
 
diff --git a/lib/lp/services/scripts/tests/loglevels.py b/lib/lp/services/scripts/tests/loglevels.py
index 5e760f6..aaf24ef 100644
--- a/lib/lp/services/scripts/tests/loglevels.py
+++ b/lib/lp/services/scripts/tests/loglevels.py
@@ -11,22 +11,21 @@ from __future__ import absolute_import, print_function
 __metaclass__ = type
 __all__ = []
 
-# Monkey patch time.gmtime to make our tests easier to read.
+from optparse import OptionParser
 import time
 
+from lp.services.scripts.logger import (
+    logger,
+    logger_options,
+    )
+
 
+# Monkey patch time.gmtime to make our tests easier to read.
 def fake_gmtime(ignored_seconds):
     # 1985-12-21 13:45:55
     return (1985, 12, 21, 13, 45, 55, 5, 355, 0)
 time.gmtime = fake_gmtime
 
-from optparse import OptionParser
-
-from lp.services.scripts.logger import (
-    logger,
-    logger_options,
-    )
-
 parser = OptionParser()
 logger_options(parser)
 
diff --git a/lib/lp/services/timeout.py b/lib/lp/services/timeout.py
index 65c83ec..0f40257 100644
--- a/lib/lp/services/timeout.py
+++ b/lib/lp/services/timeout.py
@@ -168,7 +168,7 @@ class with_timeout:
             t.start()
             try:
                 t.join(timeout)
-            except Exception as e:
+            except Exception:
                 # This will commonly be SoftTimeLimitExceeded from celery,
                 # since celery's timeout often happens before the job's due
                 # to job setup time.
diff --git a/lib/lp/services/twistedsupport/loggingsupport.py b/lib/lp/services/twistedsupport/loggingsupport.py
index 1fdfcbc..5e6a7c5 100644
--- a/lib/lp/services/twistedsupport/loggingsupport.py
+++ b/lib/lp/services/twistedsupport/loggingsupport.py
@@ -18,7 +18,6 @@ from twisted.python import (
     log,
     logfile,
     )
-from twisted.web import xmlrpc
 from zope.interface import implementer
 
 from lp.services.webapp import errorlog
diff --git a/lib/lp/services/twistedsupport/tests/test_processmonitor.py b/lib/lp/services/twistedsupport/tests/test_processmonitor.py
index 5ba2820..d4e853a 100644
--- a/lib/lp/services/twistedsupport/tests/test_processmonitor.py
+++ b/lib/lp/services/twistedsupport/tests/test_processmonitor.py
@@ -35,7 +35,7 @@ def makeFailure(exception_factory, *args, **kwargs):
     """
     try:
         raise exception_factory(*args, **kwargs)
-    except:
+    except Exception:
         return failure.Failure()
 
 
diff --git a/scripts/code-import-worker-monitor.py b/scripts/code-import-worker-monitor.py
index 759df66..ba87951 100755
--- a/scripts/code-import-worker-monitor.py
+++ b/scripts/code-import-worker-monitor.py
@@ -15,7 +15,7 @@ This script is usually run by the code-import-dispatcher cronscript.
 __metaclass__ = type
 
 
-import _pythonpath
+import _pythonpath  # noqa: F401
 
 import os
 
diff --git a/scripts/code-import-worker.py b/scripts/code-import-worker.py
index 7259f32..b968b50 100755
--- a/scripts/code-import-worker.py
+++ b/scripts/code-import-worker.py
@@ -15,7 +15,7 @@ communicates progress and results to the database.
 __metaclass__ = type
 
 
-import _pythonpath
+import _pythonpath  # noqa: F401
 
 from optparse import OptionParser
 import os
diff --git a/utilities/format-imports b/utilities/format-imports
index eb139d8..084e527 100755
--- a/utilities/format-imports
+++ b/utilities/format-imports
@@ -136,7 +136,7 @@ import sys
 from textwrap import dedent
 
 sys.path[0:0] = [os.path.dirname(__file__)]
-from python_standard_libs import python_standard_libs
+from python_standard_libs import python_standard_libs  # noqa: E402
 
 # python_standard_libs is only used for membership tests.
 python_standard_libs = frozenset(python_standard_libs)
@@ -153,7 +153,7 @@ from_import_multi_regex = re.compile(
     re.M)
 comment_regex = re.compile(
     "(?P<comment>(^#.+\n)+)(^import|^from) +(?P<module>[a-zA-Z0-9_.]+)", re.M)
-split_regex = re.compile(",\s*")
+split_regex = re.compile(r",\s*")
 
 # The base part of an import is its leading part: either a series of
 # dots, or a leading identifier.
@@ -169,7 +169,7 @@ module_docstring_regex = re.compile(
 # comments which are followed by an import line. Sometimes we even find
 # lines that contain a single ")"... :-(
 imports_section_regex = re.compile(
-    "(^#.+\n)*^(import|(from ((?!__future__)\S+) import)).*\n"
+    "(^#.+\n)*^(import|(from ((?!__future__)\\S+) import)).*\n"
     "(^import .+\n|^from .+\n|^[\t ]+.+\n|(^#.+\n)+((^import|^from) "
     ".+\n)|^\n|^[)]\n)*",
     re.M)
diff --git a/utilities/lsconf.py b/utilities/lsconf.py
index c6306d7..aa24349 100755
--- a/utilities/lsconf.py
+++ b/utilities/lsconf.py
@@ -10,7 +10,7 @@ from __future__ import absolute_import, print_function
 __metatype__ = type
 
 # Scripts may have relative imports.
-import _pythonpath
+import _pythonpath  # noqa: F401
 
 from operator import attrgetter
 from optparse import OptionParser
diff --git a/utilities/update-copyright b/utilities/update-copyright
index dcca9db..ee1fad7 100755
--- a/utilities/update-copyright
+++ b/utilities/update-copyright
@@ -88,4 +88,3 @@ if __name__ == "__main__":
         find_and_update()
     else:
         update_files(sys.argv[1:])
-
diff --git a/utilities/update-sourcecode b/utilities/update-sourcecode
index a10eb01..df0dac7 100755
--- a/utilities/update-sourcecode
+++ b/utilities/update-sourcecode
@@ -12,7 +12,7 @@ import sys
 sys.path.insert(0,
     os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib'))
 
-from devscripts import sourcecode
+from devscripts import sourcecode  # noqa: E402
 
 
 if __name__ == '__main__':