Merge lp:~stevenk/launchpad/format-imports-once-more into lp:launchpad

[Steve Kowalik]

Run format-imports lib/lp over the tree. Once more, with feeling.

Run format-imports lib/lp over the tree. Once more, with feeling.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/tests/test_bugview.py'
--- lib/lp/bugs/browser/tests/test_bugview.py	2012-07-30 05:32:01 +0000
+++ lib/lp/bugs/browser/tests/test_bugview.py	2012-08-08 05:50:35 +0000
@@ -17,8 +17,8 @@
     TestCaseWithFactory,
     )
 from lp.testing.layers import (
+    DatabaseFunctionalLayer,
     LaunchpadFunctionalLayer,
-    DatabaseFunctionalLayer,
     )
 
 

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2012-08-07 02:58:20 +0000
+++ lib/lp/bugs/model/bugtarget.py	2012-08-08 05:50:35 +0000
@@ -23,9 +23,11 @@
 
 from lp.bugs.interfaces.bugtarget import IOfficialBugTag
 from lp.bugs.interfaces.bugtask import UNRESOLVED_BUGTASK_STATUSES
-from lp.bugs.interfaces.bugtasksearch import BugTagsSearchCombinator
 from lp.bugs.interfaces.bugtaskfilter import simple_weight_calculator
-from lp.bugs.interfaces.bugtasksearch import BugTaskSearchParams
+from lp.bugs.interfaces.bugtasksearch import (
+    BugTagsSearchCombinator,
+    BugTaskSearchParams,
+    )
 from lp.bugs.model.bugtask import BugTaskSet
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.product import IProduct

=== modified file 'lib/lp/bugs/model/bugtasksearch.py'
--- lib/lp/bugs/model/bugtasksearch.py	2012-08-07 13:50:53 +0000
+++ lib/lp/bugs/model/bugtasksearch.py	2012-08-08 05:50:35 +0000
@@ -91,7 +91,7 @@
     ArrayIntersects,
     get_where_for_reference,
     NullCount,
-    Unnest
+    Unnest,
     )
 from lp.services.propertycache import get_property_cache
 from lp.services.searchbuilder import (

=== modified file 'lib/lp/registry/browser/tests/test_product.py'
--- lib/lp/registry/browser/tests/test_product.py	2012-07-30 19:57:10 +0000
+++ lib/lp/registry/browser/tests/test_product.py	2012-08-08 05:50:35 +0000
@@ -5,8 +5,8 @@
 
 __metaclass__ = type
 
+from lazr.restful.interfaces import IJSONRequestCache
 import transaction
-from lazr.restful.interfaces import IJSONRequestCache
 from zope.component import getUtility
 from zope.schema.vocabulary import SimpleVocabulary
 

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2012-08-07 03:44:05 +0000
+++ lib/lp/registry/model/person.py	2012-08-08 05:50:35 +0000
@@ -135,9 +135,11 @@
 from lp.blueprints.model.specificationworkitem import SpecificationWorkItem
 from lp.bugs.interfaces.bugtarget import IBugTarget
 from lp.bugs.interfaces.bugtask import IBugTaskSet
-from lp.bugs.interfaces.bugtasksearch import BugTaskSearchParams
+from lp.bugs.interfaces.bugtasksearch import (
+    BugTaskSearchParams,
+    get_person_bugtasks_search_params,
+    )
 from lp.bugs.model.bugtarget import HasBugsBase
-from lp.bugs.interfaces.bugtasksearch import get_person_bugtasks_search_params
 from lp.bugs.model.structuralsubscription import StructuralSubscription
 from lp.code.interfaces.branchcollection import (
     IAllBranches,

=== modified file 'lib/lp/services/job/tests/test_celeryjob.py'
--- lib/lp/services/job/tests/test_celeryjob.py	2012-08-06 20:50:51 +0000
+++ lib/lp/services/job/tests/test_celeryjob.py	2012-08-08 05:50:35 +0000
@@ -5,9 +5,9 @@
 import sys
 from time import sleep
 
+from lazr.jobrunner.bin.clear_queues import clear_queues
 from testtools.content import Content
 from testtools.content_type import UTF8_TEXT
-from lazr.jobrunner.bin.clear_queues import clear_queues
 
 from lp.code.model.branchjob import BranchScanJob
 from lp.scripts.helpers import TransactionFreeOperation

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2012-07-30 20:14:38 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2012-08-08 05:50:35 +0000
@@ -52,7 +52,6 @@
     SoyuzScriptError,
     )
 
-
 # XXX cprov 2009-06-12: this function should be incorporated in
 # IPublishing.
 def update_files_privacy(pub_record):

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2012-08-01 05:47:07 +0000
+++ lib/lp/testing/factory.py	2012-08-08 05:50:35 +0000
@@ -247,9 +247,7 @@
 from lp.services.temporaryblobstorage.interfaces import (
     ITemporaryStorageManager,
     )
-from lp.services.temporaryblobstorage.model import (
-    TemporaryBlobStorage,
-    )
+from lp.services.temporaryblobstorage.model import TemporaryBlobStorage
 from lp.services.utils import AutoDecorate
 from lp.services.webapp.dbpolicy import MasterDatabasePolicy
 from lp.services.webapp.interfaces import (

=== modified file 'lib/lp/testing/pages.py'
--- lib/lp/testing/pages.py	2012-07-26 20:54:51 +0000
+++ lib/lp/testing/pages.py	2012-08-08 05:50:35 +0000
@@ -38,8 +38,8 @@
     SimpleCookie,
     )
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 from zope.session.interfaces import ISession
-from zope.security.proxy import removeSecurityProxy
 from zope.testbrowser.testing import Browser
 
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities