launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/format-imports-ad-infinitum into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/format-imports-ad-infinitum/+merge/122981

format-imports over lib/lp once again.
-- 
https://code.launchpad.net/~stevenk/launchpad/format-imports-ad-infinitum/+merge/122981
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/format-imports-ad-infinitum into lp:launchpad.

=== modified file 'lib/lp/blueprints/browser/tests/test_specification.py'
--- lib/lp/blueprints/browser/tests/test_specification.py	2012-09-04 19:51:25 +0000
+++ lib/lp/blueprints/browser/tests/test_specification.py	2012-09-06 00:37:19 +0000
@@ -9,6 +9,7 @@
 
 from BeautifulSoup import BeautifulSoup
 import pytz
+import soupmatchers
 from testtools.matchers import (
     Equals,
     Not,
@@ -19,7 +20,6 @@
 from zope.publisher.interfaces import NotFound
 from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
-import soupmatchers
 
 from lp.app.browser.tales import format_link
 from lp.blueprints.browser import specification

=== modified file 'lib/lp/blueprints/tests/test_specification.py'
--- lib/lp/blueprints/tests/test_specification.py	2012-09-05 19:15:18 +0000
+++ lib/lp/blueprints/tests/test_specification.py	2012-09-06 00:37:19 +0000
@@ -29,20 +29,20 @@
     PRIVATE_INFORMATION_TYPES,
     PUBLIC_INFORMATION_TYPES,
     )
-from lp.services.webapp.authorization import check_permission
 from lp.security import (
     AdminSpecification,
     EditSpecificationByRelatedPeople,
     EditWhiteboardSpecification,
     ViewSpecification,
     )
+from lp.services.webapp.authorization import check_permission
+from lp.services.webapp.interaction import ANONYMOUS
 from lp.testing import (
     login_person,
     person_logged_in,
     TestCaseWithFactory,
     )
 from lp.testing.layers import DatabaseFunctionalLayer
-from lp.services.webapp.interaction import ANONYMOUS
 
 
 class SpecificationTests(TestCaseWithFactory):

=== modified file 'lib/lp/bugs/browser/tests/test_bug_views.py'
--- lib/lp/bugs/browser/tests/test_bug_views.py	2012-08-30 05:48:03 +0000
+++ lib/lp/bugs/browser/tests/test_bug_views.py	2012-09-06 00:37:19 +0000
@@ -20,8 +20,8 @@
 from zope.security.proxy import removeSecurityProxy
 
 from lp.registry.enums import (
+    BugSharingPolicy,
     InformationType,
-    BugSharingPolicy,
     )
 from lp.registry.interfaces.accesspolicy import (
     IAccessPolicyGrantSource,

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2012-08-29 06:57:53 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2012-09-06 00:37:19 +0000
@@ -40,9 +40,7 @@
     InformationType,
     )
 from lp.registry.interfaces.accesspolicy import IAccessPolicySource
-from lp.registry.interfaces.person import (
-    PersonVisibility,
-    )
+from lp.registry.interfaces.person import PersonVisibility
 from lp.services.config import config
 from lp.services.database.constants import UTC_NOW
 from lp.services.helpers import truncate_text

=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py	2012-08-21 14:15:43 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py	2012-09-06 00:37:19 +0000
@@ -65,9 +65,7 @@
     find_main_content,
     find_tag_by_id,
     )
-from lp.testing.sampledata import (
-    ADMIN_EMAIL,
-    )
+from lp.testing.sampledata import ADMIN_EMAIL
 from lp.testing.views import (
     create_initialized_view,
     create_view,

=== modified file 'lib/lp/code/model/branchnamespace.py'
--- lib/lp/code/model/branchnamespace.py	2012-08-31 02:24:18 +0000
+++ lib/lp/code/model/branchnamespace.py	2012-09-06 00:37:19 +0000
@@ -51,8 +51,8 @@
     FREE_INFORMATION_TYPES,
     FREE_PRIVATE_INFORMATION_TYPES,
     InformationType,
+    NON_EMBARGOED_INFORMATION_TYPES,
     PersonVisibility,
-    NON_EMBARGOED_INFORMATION_TYPES,
     PUBLIC_INFORMATION_TYPES,
     )
 from lp.registry.errors import (

=== modified file 'lib/lp/code/model/tests/test_branchcollection.py'
--- lib/lp/code/model/tests/test_branchcollection.py	2012-08-22 03:18:12 +0000
+++ lib/lp/code/model/tests/test_branchcollection.py	2012-09-06 00:37:19 +0000
@@ -32,7 +32,10 @@
 from lp.code.model.branch import Branch
 from lp.code.model.branchcollection import GenericBranchCollection
 from lp.code.tests.helpers import remove_all_sample_data_branches
-from lp.registry.enums import InformationType, PersonVisibility
+from lp.registry.enums import (
+    InformationType,
+    PersonVisibility,
+    )
 from lp.registry.interfaces.person import TeamMembershipPolicy
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.webapp.interfaces import (

=== modified file 'lib/lp/code/model/tests/test_branchnamespace.py'
--- lib/lp/code/model/tests/test_branchnamespace.py	2012-08-29 06:57:53 +0000
+++ lib/lp/code/model/tests/test_branchnamespace.py	2012-09-06 00:37:19 +0000
@@ -52,9 +52,7 @@
     NoSuchSourcePackageName,
     )
 from lp.registry.interfaces.distribution import NoSuchDistribution
-from lp.registry.interfaces.person import (
-    NoSuchPerson,
-    )
+from lp.registry.interfaces.person import NoSuchPerson
 from lp.registry.interfaces.product import NoSuchProduct
 from lp.registry.model.sourcepackage import SourcePackage
 from lp.testing import (

=== modified file 'lib/lp/codehosting/__init__.py'
--- lib/lp/codehosting/__init__.py	2012-06-28 12:07:06 +0000
+++ lib/lp/codehosting/__init__.py	2012-09-06 00:37:19 +0000
@@ -18,12 +18,11 @@
 
 import bzrlib
 from bzrlib.plugin import load_plugins
-
-from lp.services.config import config
-
 # This import is needed so that bzr's logger gets registered.
 import bzrlib.trace
 
+from lp.services.config import config
+
 
 def get_bzr_path():
     """Find the path to the copy of Bazaar for this rocketfuel instance"""

=== modified file 'lib/lp/codehosting/tests/test_safe_open.py'
--- lib/lp/codehosting/tests/test_safe_open.py	2012-08-22 18:54:06 +0000
+++ lib/lp/codehosting/tests/test_safe_open.py	2012-09-06 00:37:19 +0000
@@ -32,9 +32,7 @@
     SafeBranchOpener,
     WhitelistPolicy,
     )
-from lp.codehosting.tests.helpers import (
-    force_stacked_on_url,
-    )
+from lp.codehosting.tests.helpers import force_stacked_on_url
 from lp.testing import TestCase
 
 

=== modified file 'lib/lp/codehosting/tests/test_upgrade.py'
--- lib/lp/codehosting/tests/test_upgrade.py	2012-08-22 18:54:06 +0000
+++ lib/lp/codehosting/tests/test_upgrade.py	2012-09-06 00:37:19 +0000
@@ -28,8 +28,8 @@
     RepositoryFormat,
     )
 from lp.codehosting.bzrutils import read_locked
+from lp.codehosting.tests.helpers import force_stacked_on_url
 from lp.codehosting.upgrade import Upgrader
-from lp.codehosting.tests.helpers import force_stacked_on_url
 from lp.services.config import config
 from lp.testing import TestCaseWithFactory
 from lp.testing.layers import ZopelessDatabaseLayer

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2012-08-20 14:35:40 +0000
+++ lib/lp/registry/browser/person.py	2012-09-06 00:37:19 +0000
@@ -124,9 +124,7 @@
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
-from lp.app.browser.lazrjs import (
-    TextAreaEditorWidget,
-    )
+from lp.app.browser.lazrjs import TextAreaEditorWidget
 from lp.app.browser.tales import (
     DateTimeFormatterAPI,
     PersonFormatterAPI,

=== modified file 'lib/lp/registry/browser/tests/test_person.py'
--- lib/lp/registry/browser/tests/test_person.py	2012-08-20 13:28:42 +0000
+++ lib/lp/registry/browser/tests/test_person.py	2012-09-06 00:37:19 +0000
@@ -19,9 +19,7 @@
 from zope.component import getUtility
 from zope.publisher.interfaces import NotFound
 
-from lp.app.browser.lazrjs import (
-    TextAreaEditorWidget,
-    )
+from lp.app.browser.lazrjs import TextAreaEditorWidget
 from lp.app.errors import NotFoundError
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.buildmaster.enums import BuildStatus

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2012-09-03 11:22:25 +0000
+++ lib/lp/registry/model/product.py	2012-09-06 00:37:19 +0000
@@ -125,8 +125,8 @@
     )
 from lp.registry.errors import CommercialSubscribersOnly
 from lp.registry.interfaces.accesspolicy import (
+    IAccessPolicyArtifactSource,
     IAccessPolicyGrantSource,
-    IAccessPolicyArtifactSource,
     IAccessPolicySource,
     )
 from lp.registry.interfaces.oopsreferences import IHasOOPSReferences

=== modified file 'lib/lp/soyuz/tests/test_packagecopyjob.py'
--- lib/lp/soyuz/tests/test_packagecopyjob.py	2012-08-20 18:20:36 +0000
+++ lib/lp/soyuz/tests/test_packagecopyjob.py	2012-09-06 00:37:19 +0000
@@ -56,7 +56,9 @@
 from lp.soyuz.interfaces.sourcepackageformat import (
     ISourcePackageFormatSelectionSet,
     )
-from lp.soyuz.model.distroseriesdifferencejob import FEATURE_FLAG_ENABLE_MODULE
+from lp.soyuz.model.distroseriesdifferencejob import (
+    FEATURE_FLAG_ENABLE_MODULE,
+    )
 from lp.soyuz.model.packagecopyjob import PackageCopyJob
 from lp.soyuz.model.queue import PackageUpload
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher