launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/imports-really-this-time into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/imports-really-this-time/+merge/112470

format-imports. Because we all suck.
-- 
https://code.launchpad.net/~stevenk/launchpad/imports-really-this-time/+merge/112470
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/imports-really-this-time into lp:launchpad.

=== modified file 'lib/lp/app/widgets/tests/test_popup.py'
--- lib/lp/app/widgets/tests/test_popup.py	2012-06-21 06:57:06 +0000
+++ lib/lp/app/widgets/tests/test_popup.py	2012-06-28 01:23:21 +0000
@@ -2,6 +2,7 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 from lp.services.features.testing import FeatureFixture
 
+
 __metaclass__ = type
 
 import simplejson

=== modified file 'lib/lp/bugs/scripts/bugsummaryrebuild.py'
--- lib/lp/bugs/scripts/bugsummaryrebuild.py	2012-06-25 11:23:12 +0000
+++ lib/lp/bugs/scripts/bugsummaryrebuild.py	2012-06-28 01:23:21 +0000
@@ -3,8 +3,6 @@
 
 __metaclass__ = type
 
-import transaction
-
 from storm.expr import (
     Alias,
     And,
@@ -17,13 +15,14 @@
     With,
     )
 from storm.properties import Bool
+import transaction
 
 from lp.bugs.model.bug import BugTag
 from lp.bugs.model.bugsubscription import BugSubscription
 from lp.bugs.model.bugsummary import BugSummary
 from lp.bugs.model.bugtask import (
+    bug_target_from_key,
     bug_target_to_key,
-    bug_target_from_key,
     BugTask,
     )
 from lp.bugs.model.bugtaskflat import BugTaskFlat
@@ -34,10 +33,10 @@
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.series import ISeriesMixin
+from lp.registry.model.distribution import Distribution
+from lp.registry.model.distroseries import DistroSeries
 from lp.registry.model.product import Product
 from lp.registry.model.productseries import ProductSeries
-from lp.registry.model.distribution import Distribution
-from lp.registry.model.distroseries import DistroSeries
 from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.services.database.bulk import create
 from lp.services.database.lpstorm import IStore

=== modified file 'lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py'
--- lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py	2012-06-25 11:09:15 +0000
+++ lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py	2012-06-28 01:23:21 +0000
@@ -21,8 +21,8 @@
     calculate_bugsummary_rows,
     format_target,
     get_bugsummary_rows,
+    get_bugsummary_targets,
     get_bugsummaryjournal_rows,
-    get_bugsummary_targets,
     get_bugtask_targets,
     RawBugSummary,
     rebuild_bugsummary_for_target,

=== modified file 'lib/lp/bugs/tests/test_bugtracker.py'
--- lib/lp/bugs/tests/test_bugtracker.py	2012-06-22 18:41:45 +0000
+++ lib/lp/bugs/tests/test_bugtracker.py	2012-06-28 01:23:21 +0000
@@ -44,8 +44,8 @@
 from lp.registry.interfaces.person import IPersonSet
 from lp.testing import (
     login,
+    login_celebrity,
     login_person,
-    login_celebrity,
     TestCase,
     TestCaseWithFactory,
     )

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2012-06-26 14:11:23 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2012-06-28 01:23:21 +0000
@@ -29,9 +29,9 @@
 from zope.security.proxy import removeSecurityProxy
 
 from lp.code.bzr import (
+    branch_revision_history,
     BranchFormat,
     RepositoryFormat,
-    branch_revision_history,
     )
 from lp.code.enums import (
     BranchMergeProposalStatus,

=== modified file 'lib/lp/code/tests/test_bzr.py'
--- lib/lp/code/tests/test_bzr.py	2012-06-26 14:43:55 +0000
+++ lib/lp/code/tests/test_bzr.py	2012-06-28 01:23:21 +0000
@@ -5,9 +5,7 @@
 
 __metaclass__ = type
 
-from bzrlib.errors import (
-    NoSuchRevision,
-    )
+from bzrlib.errors import NoSuchRevision
 from bzrlib.revision import NULL_REVISION
 from bzrlib.tests import (
     TestCaseInTempDir,
@@ -15,8 +13,8 @@
     )
 
 from lp.code.bzr import (
+    branch_revision_history,
     BranchFormat,
-    branch_revision_history,
     ControlFormat,
     get_ancestry,
     get_branch_formats,

=== modified file 'lib/lp/registry/model/sharingjob.py'
--- lib/lp/registry/model/sharingjob.py	2012-06-19 04:38:35 +0000
+++ lib/lp/registry/model/sharingjob.py	2012-06-28 01:23:21 +0000
@@ -44,9 +44,7 @@
 from lp.bugs.interfaces.bug import IBugSet
 from lp.bugs.model.bugsubscription import BugSubscription
 from lp.bugs.model.bugtaskflat import BugTaskFlat
-from lp.bugs.model.bugtasksearch import (
-    get_bug_privacy_filter_terms,
-    )
+from lp.bugs.model.bugtasksearch import get_bug_privacy_filter_terms
 from lp.registry.enums import InformationType
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProduct

=== modified file 'lib/lp/registry/model/teammembership.py'
--- lib/lp/registry/model/teammembership.py	2012-06-15 02:26:09 +0000
+++ lib/lp/registry/model/teammembership.py	2012-06-28 01:23:21 +0000
@@ -42,9 +42,7 @@
     IMembershipNotificationJobSource,
     )
 from lp.registry.interfaces.role import IPersonRoles
-from lp.registry.interfaces.sharingjob import (
-    IRemoveBugSubscriptionsJobSource,
-    )
+from lp.registry.interfaces.sharingjob import IRemoveBugSubscriptionsJobSource
 from lp.registry.interfaces.teammembership import (
     ACTIVE_STATES,
     CyclicalTeamMembershipError,

=== modified file 'lib/lp/registry/services/sharingservice.py'
--- lib/lp/registry/services/sharingservice.py	2012-06-19 03:05:00 +0000
+++ lib/lp/registry/services/sharingservice.py	2012-06-28 01:23:21 +0000
@@ -11,9 +11,7 @@
 from itertools import product
 
 from lazr.restful.interfaces import IWebBrowserOriginatingRequest
-from lazr.restful.utils import (
-    get_current_web_service_request,
-    )
+from lazr.restful.utils import get_current_web_service_request
 from storm.expr import (
     And,
     In,
@@ -46,14 +44,12 @@
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.projectgroup import IProjectGroup
-from lp.registry.interfaces.sharingjob import (
-    IRemoveBugSubscriptionsJobSource,
-    )
+from lp.registry.interfaces.sharingjob import IRemoveBugSubscriptionsJobSource
 from lp.registry.interfaces.sharingservice import ISharingService
 from lp.registry.model.accesspolicy import (
     AccessArtifactGrant,
+    AccessPolicyArtifact,
     AccessPolicyGrant,
-    AccessPolicyArtifact,
     )
 from lp.registry.model.person import Person
 from lp.registry.model.teammembership import TeamParticipation

=== modified file 'lib/lp/registry/tests/test_productjob.py'
--- lib/lp/registry/tests/test_productjob.py	2012-06-18 20:54:11 +0000
+++ lib/lp/registry/tests/test_productjob.py	2012-06-28 01:23:21 +0000
@@ -11,9 +11,9 @@
     )
 
 import pytz
-import transaction
 from testtools.content import Content
 from testtools.content_type import UTF8_TEXT
+import transaction
 from zope.component import getUtility
 from zope.interface import (
     classProvides,

=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
--- lib/lp/registry/tests/test_sourcepackage.py	2012-06-21 15:11:30 +0000
+++ lib/lp/registry/tests/test_sourcepackage.py	2012-06-28 01:23:21 +0000
@@ -12,11 +12,11 @@
 from storm.locals import Store
 import transaction
 from zope.component import getUtility
+from zope.interface.verify import verifyObject
 from zope.security.checker import canAccess
 from zope.security.interfaces import Unauthorized
 from zope.security.management import checkPermission
 from zope.security.proxy import removeSecurityProxy
-from zope.interface.verify import verifyObject
 
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.code.model.seriessourcepackagebranch import (

=== modified file 'lib/lp/security.py'
--- lib/lp/security.py	2012-06-15 00:39:13 +0000
+++ lib/lp/security.py	2012-06-28 01:23:21 +0000
@@ -11,21 +11,20 @@
     'ModerateByRegistryExpertsOrAdmins',
     ]
 
-from zope.component import (
-    getUtility,
-    queryAdapter,
-    )
-from zope.interface import Interface
-
 from storm.expr import (
+    And,
     Exists,
-    And,
     Or,
     Select,
     SQL,
     Union,
     With,
     )
+from zope.component import (
+    getUtility,
+    queryAdapter,
+    )
+from zope.interface import Interface
 
 from lp.answers.interfaces.faq import IFAQ
 from lp.answers.interfaces.faqtarget import IFAQTarget
@@ -57,8 +56,8 @@
 from lp.bugs.interfaces.bugtarget import IOfficialBugTagTargetRestricted
 from lp.bugs.interfaces.structuralsubscription import IStructuralSubscription
 from lp.bugs.model.bugsubscription import BugSubscription
+from lp.bugs.model.bugtaskflat import BugTaskFlat
 from lp.bugs.model.bugtasksearch import get_bug_privacy_filter
-from lp.bugs.model.bugtaskflat import BugTaskFlat
 from lp.buildmaster.interfaces.builder import (
     IBuilder,
     IBuilderSet,

=== modified file 'lib/lp/services/mail/tests/test_commands.py'
--- lib/lp/services/mail/tests/test_commands.py	2012-06-20 11:57:08 +0000
+++ lib/lp/services/mail/tests/test_commands.py	2012-06-28 01:23:21 +0000
@@ -4,12 +4,11 @@
 from doctest import DocTestSuite
 import unittest
 
-from lp.testing import TestCase
-
-from lp.services.mail.commands import(
+from lp.services.mail.commands import (
     EmailCommand,
     EmailCommandCollection,
     )
+from lp.testing import TestCase
 
 
 class CommandOne(EmailCommand):

=== modified file 'lib/lp/soyuz/tests/test_vocabularies.py'
--- lib/lp/soyuz/tests/test_vocabularies.py	2012-06-19 23:01:58 +0000
+++ lib/lp/soyuz/tests/test_vocabularies.py	2012-06-28 01:23:21 +0000
@@ -5,10 +5,9 @@
 
 __metaclass__ = type
 
+from testtools.matchers import MatchesStructure
 from zope.schema.vocabulary import SimpleTerm
 
-from testtools.matchers import MatchesStructure
-
 from lp.soyuz.vocabularies import PPAVocabulary
 from lp.testing import TestCaseWithFactory
 from lp.testing.layers import DatabaseFunctionalLayer