Merge ~cristiangsp/launchpad:linting-e402 into launchpad:master

[Cristian Gonzalez]

Fixing E402 linting errors

Fixing E402 linting errors

[Colin Watson (cjwatson)]

review: Approve

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/app/__init__.py b/lib/lp/app/__init__.py
index e79d7bd..7006d36 100644
--- a/lib/lp/app/__init__.py
+++ b/lib/lp/app/__init__.py
@@ -15,10 +15,8 @@ __all__ = []
 # values, but they kindly left this global variable for you to monkey patch if
 # you want the old behaviour, just like we do.
 from zope.formlib import itemswidgets
-
-
-itemswidgets.EXPLICIT_EMPTY_SELECTION = False
-
 # Load versioninfo.py so that we get errors on start-up rather than waiting
 # for first page load.
 import lp.app.versioninfo  # noqa: F401
+
+itemswidgets.EXPLICIT_EMPTY_SELECTION = False
diff --git a/lib/lp/bugs/interfaces/bug.py b/lib/lp/bugs/interfaces/bug.py
index 4c14118..5fde710 100644
--- a/lib/lp/bugs/interfaces/bug.py
+++ b/lib/lp/bugs/interfaces/bug.py
@@ -1029,7 +1029,7 @@ patch_collection_property(ICve, 'bugs', IBug)
 # In order to avoid circular dependencies, we only import
 # IBugSubscription (which itself imports IBug) here, and assign it as
 # the value type for the `subscriptions` collection.
-from lp.bugs.interfaces.bugsubscription import IBugSubscription
+from lp.bugs.interfaces.bugsubscription import IBugSubscription # noqa: E402
 patch_collection_property(IBug, 'subscriptions', IBugSubscription)
 
 
diff --git a/lib/lp/bugs/interfaces/bugsubscription.py b/lib/lp/bugs/interfaces/bugsubscription.py
index f0241d4..3913944 100644
--- a/lib/lp/bugs/interfaces/bugsubscription.py
+++ b/lib/lp/bugs/interfaces/bugsubscription.py
@@ -86,5 +86,5 @@ class IBugSubscription(Interface):
 # In order to avoid circular dependencies, we only import
 # IBug (which itself imports IBugSubscription) here, and assign it as
 # the value type for the `bug` reference.
-from lp.bugs.interfaces.bug import IBug
+from lp.bugs.interfaces.bug import IBug # noqa: E402
 patch_reference_property(IBugSubscription, 'bug', IBug)
diff --git a/lib/lp/bugs/model/bug.py b/lib/lp/bugs/model/bug.py
index c1cc4c8..4f4ea06 100644
--- a/lib/lp/bugs/model/bug.py
+++ b/lib/lp/bugs/model/bug.py
@@ -75,6 +75,7 @@ from zope.component import getUtility
 from zope.contenttype import guess_content_type
 from zope.event import notify
 from zope.interface import implementer
+from zope.security import checker
 from zope.security.interfaces import Unauthorized
 from zope.security.proxy import (
     ProxyFactory,
@@ -2385,7 +2386,6 @@ class StructuralSubscriptionSet(FrozenSetBasedSet):
 # writing ZCML tedious, so I've opted for registering custom checkers (see
 # lp_sitecustomize for some other jiggery pokery in the same vein) while I
 # seek a better solution.
-from zope.security import checker
 checker_for_frozen_set = checker.getCheckerForInstancesOf(frozenset)
 checker_for_subscriber_set = checker.NamesChecker(["sorted"])
 checker_for_subscription_set = checker.NamesChecker(["sorted", "subscribers"])
diff --git a/lib/lp/code/bzr.py b/lib/lp/code/bzr.py
index 88d7abb..e823fc2 100644
--- a/lib/lp/code/bzr.py
+++ b/lib/lp/code/bzr.py
@@ -19,10 +19,7 @@ __all__ = [
 
 # FIRST Ensure correct plugins are loaded. Do not delete this comment or the
 # line below this comment.
-import lp.codehosting
-
-# Silence lint warning.
-lp.codehosting
+import lp.codehosting # noqa: F401
 
 from breezy.branch import UnstackableBranchFormat
 from breezy.bzr.branch import (
diff --git a/lib/lp/codehosting/__init__.py b/lib/lp/codehosting/__init__.py
index c194128..09b1b64 100644
--- a/lib/lp/codehosting/__init__.py
+++ b/lib/lp/codehosting/__init__.py
@@ -82,6 +82,6 @@ def dont_wrap_class_and_subclasses(cls):
 
 # Don't wrap Branch or its subclasses in Zope security proxies.  Make sure
 # the various LoomBranch classes are present first.
-import breezy.plugins.loom.branch
+import breezy.plugins.loom.branch # noqa: E402
 breezy.plugins.loom.branch
 dont_wrap_class_and_subclasses(Branch)
diff --git a/lib/lp/codehosting/puller/__init__.py b/lib/lp/codehosting/puller/__init__.py
index 48ec941..e1582ed 100644
--- a/lib/lp/codehosting/puller/__init__.py
+++ b/lib/lp/codehosting/puller/__init__.py
@@ -10,14 +10,13 @@ import datetime
 import pytz
 from twisted.internet import defer
 
+from lp.codehosting.puller.scheduler import LockError
 
 def get_lock_id_for_branch_id(branch_id):
     """Return the lock id that should be used for a branch with the passed id.
     """
     return 'worker-for-branch-%s@supermirror' % (branch_id,)
 
-from lp.codehosting.puller.scheduler import LockError
-
 UTC = pytz.timezone('UTC')
 
 
diff --git a/lib/lp/registry/interfaces/product.py b/lib/lp/registry/interfaces/product.py
index e5ac436..b770b13 100644
--- a/lib/lp/registry/interfaces/product.py
+++ b/lib/lp/registry/interfaces/product.py
@@ -1184,7 +1184,7 @@ class InvalidProductName(LaunchpadValidationError):
 
 
 # Fix circular imports.
-from lp.registry.interfaces.distributionsourcepackage import (
+from lp.registry.interfaces.distributionsourcepackage import ( # noqa: E402
     IDistributionSourcePackage)
 patch_reference_property(
     IDistributionSourcePackage, 'upstream_product', IProduct)
diff --git a/lib/lp/scripts/utilities/importpedant.py b/lib/lp/scripts/utilities/importpedant.py
index dc837e5..160af05 100644
--- a/lib/lp/scripts/utilities/importpedant.py
+++ b/lib/lp/scripts/utilities/importpedant.py
@@ -5,20 +5,19 @@ import atexit
 import itertools
 from operator import attrgetter
 import types
+import warnings
 
 import six
 from six.moves import builtins
 
-
-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')
 
 
+original_import = builtins.__import__
+naughty_imports = set()
+
 # Sometimes, third-party modules don't export all of their public APIs through
 # __all__. The following dict maps from such modules to a list of attributes
 # that are allowed to be imported, whether or not they are in __all__.
diff --git a/lib/lp/scripts/utilities/warninghandler.py b/lib/lp/scripts/utilities/warninghandler.py
index 3620a1c..88827e6 100644
--- a/lib/lp/scripts/utilities/warninghandler.py
+++ b/lib/lp/scripts/utilities/warninghandler.py
@@ -6,10 +6,24 @@
 __metaclass__ = type
 
 import inspect
+import six
 import sys
 import warnings
 
-import six
+# ViewPageTemplateFile has .filename.
+from zope.browserpage import ViewPageTemplateFile
+
+# PythonExpr has .text, the text of the expression.
+from zope.tales.pythonexpr import PythonExpr
+
+# TrustedZopeContext has self.contexts, a dict with template, view, context,
+# request, etc.
+from zope.pagetemplate.engine import TrustedZopeContext
+
+# TALInterpreter has self.sourceFile, a filename of a page template.
+from zope.tal.talinterpreter import TALInterpreter
+
+from zope.browserpage.simpleviewclass import simple
 
 
 class WarningReport:
@@ -58,21 +72,6 @@ class ImportantInfo:
             L.append('request url: %s' % self.requesturl)
         return '\n'.join(L)
 
-# ViewPageTemplateFile has .filename.
-from zope.browserpage import ViewPageTemplateFile
-
-# PythonExpr has .text, the text of the expression.
-from zope.tales.pythonexpr import PythonExpr
-
-# TrustedZopeContext has self.contexts, a dict with template, view, context,
-# request, etc.
-from zope.pagetemplate.engine import TrustedZopeContext
-
-# TALInterpreter has self.sourceFile, a filename of a page template.
-from zope.tal.talinterpreter import TALInterpreter
-
-from zope.browserpage.simpleviewclass import simple
-
 
 def find_important_info():
     stack = inspect.stack()
diff --git a/lib/lp/services/job/celeryjob.py b/lib/lp/services/job/celeryjob.py
index b4ae220..7d9e8b6 100644
--- a/lib/lp/services/job/celeryjob.py
+++ b/lib/lp/services/job/celeryjob.py
@@ -21,8 +21,6 @@ from logging import info
 import os
 from uuid import uuid4
 
-
-os.environ.setdefault('CELERY_CONFIG_MODULE', 'lp.services.job.celeryconfig')
 from celery import (
     Celery,
     Task,
@@ -46,6 +44,7 @@ from lp.services.job.runner import (
     )
 from lp.services import scripts
 
+os.environ.setdefault('CELERY_CONFIG_MODULE', 'lp.services.job.celeryconfig')
 
 celery_app = Celery()
 
diff --git a/lib/lp/services/job/tests/celery_helpers.py b/lib/lp/services/job/tests/celery_helpers.py
index b0d5ba4..c378b6f 100644
--- a/lib/lp/services/job/tests/celery_helpers.py
+++ b/lib/lp/services/job/tests/celery_helpers.py
@@ -8,14 +8,14 @@ __all__ = [
     'pop_notifications'
     ]
 
+from celery.task import task
+
 # Force the correct celeryconfig to be used.
 import lp.services.job.celeryjob
 
 # Quiet lint unused import warning.
 lp.services.job.celeryjob
 
-from celery.task import task
-
 
 @task
 def pop_notifications():
diff --git a/lib/lp/services/scripts/tests/loglevels.py b/lib/lp/services/scripts/tests/loglevels.py
index 3849fc4..0e91e44 100644
--- a/lib/lp/services/scripts/tests/loglevels.py
+++ b/lib/lp/services/scripts/tests/loglevels.py
@@ -9,22 +9,21 @@ Used by test_logger.txt.
 __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/testing/html5browser.py b/lib/lp/testing/html5browser.py
index b314667..7dd3a37 100644
--- a/lib/lp/testing/html5browser.py
+++ b/lib/lp/testing/html5browser.py
@@ -34,7 +34,7 @@ import gi
 gi.require_version('Gtk', '3.0')
 gi.require_version('WebKit', '3.0')
 
-from gi.repository import (
+from gi.repository import ( # noqa: E402
     GLib,
     Gtk,
     WebKit,
diff --git a/lib/lp/testing/swift/fakeswift.tac b/lib/lp/testing/swift/fakeswift.tac
index 742658d..c5c95b8 100644
--- a/lib/lp/testing/swift/fakeswift.tac
+++ b/lib/lp/testing/swift/fakeswift.tac
@@ -12,11 +12,10 @@ import logging
 
 import twisted.web.server
 from twisted.application import internet, service
+from lp.testing.swift.fakeswift import Root
 
 logging.basicConfig()
 
-from lp.testing.swift.fakeswift import Root
-
 storedir = os.environ['SWIFT_ROOT']
 assert os.path.exists(storedir)
 
diff --git a/scripts/wsgi-archive-auth.py b/scripts/wsgi-archive-auth.py
index b5490ee..30c3096 100755
--- a/scripts/wsgi-archive-auth.py
+++ b/scripts/wsgi-archive-auth.py
@@ -32,9 +32,9 @@ top = os.path.dirname(scripts_dir)
 sys.modules.pop("site", None)
 sys.modules.pop("sitecustomize", None)
 
-import _pythonpath  # noqa: F401
+import _pythonpath  # noqa: F401,E402
 
-from lp.soyuz.wsgi.archiveauth import check_password
+from lp.soyuz.wsgi.archiveauth import check_password # noqa: E402
 
 
 def main():
diff --git a/utilities/format-imports b/utilities/format-imports
index 5e93624..39ecf52 100755
--- a/utilities/format-imports
+++ b/utilities/format-imports
@@ -134,7 +134,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)
diff --git a/utilities/update-sourcecode b/utilities/update-sourcecode
index a10eb01..107460a 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__':