launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/format-imports-cleanup/+merge/94908

Re-run format-imports against lib/lp.
-- 
https://code.launchpad.net/~stevenk/launchpad/format-imports-cleanup/+merge/94908
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/format-imports-cleanup into lp:launchpad.

=== modified file 'lib/lp/app/interfaces/services.py'
--- lib/lp/app/interfaces/services.py	2012-02-23 10:13:48 +0000
+++ lib/lp/app/interfaces/services.py	2012-02-28 04:31:37 +0000
@@ -11,12 +11,12 @@
     'IServiceFactory',
     ]
 
-from zope.interface import Interface
-from zope.schema import TextLine
 from lazr.restful.declarations import (
     export_as_webservice_entry,
     exported,
     )
+from zope.interface import Interface
+from zope.schema import TextLine
 
 from lp import _
 

=== modified file 'lib/lp/app/model/launchpad.py'
--- lib/lp/app/model/launchpad.py	2012-02-24 20:36:33 +0000
+++ lib/lp/app/model/launchpad.py	2012-02-28 04:31:37 +0000
@@ -16,6 +16,7 @@
     ForbiddenAttribute,
     Unauthorized,
     )
+
 from lp.app.interfaces.launchpad import IPrivacy
 
 

=== modified file 'lib/lp/app/tests/test_launchpad.py'
--- lib/lp/app/tests/test_launchpad.py	2012-02-24 05:22:05 +0000
+++ lib/lp/app/tests/test_launchpad.py	2012-02-28 04:31:37 +0000
@@ -11,12 +11,8 @@
     Unauthorized,
     )
 
-from lp.app.interfaces.launchpad import (
-    IPrivacy,
-    )
-from lp.app.model.launchpad import (
-    Privacy,
-    )
+from lp.app.interfaces.launchpad import IPrivacy
+from lp.app.model.launchpad import Privacy
 from lp.testing import TestCase
 from lp.testing.layers import FunctionalLayer
 

=== modified file 'lib/lp/app/tests/test_security.py'
--- lib/lp/app/tests/test_security.py	2012-01-15 17:43:05 +0000
+++ lib/lp/app/tests/test_security.py	2012-02-28 04:31:37 +0000
@@ -17,7 +17,16 @@
     AuthorizationBase,
     DelegatedAuthorization,
     )
-from lp.registry.interfaces.person import IPerson
+from lp.registry.interfaces.person import (
+    IPerson,
+    PersonVisibility,
+    )
+from lp.registry.interfaces.role import IPersonRoles
+from lp.registry.interfaces.teammembership import (
+    ITeamMembershipSet,
+    TeamMembershipStatus,
+    )
+from lp.security import PublicOrPrivateTeamsExistence
 from lp.testing import (
     person_logged_in,
     TestCase,
@@ -28,13 +37,6 @@
     DatabaseFunctionalLayer,
     ZopelessDatabaseLayer,
     )
-from lp.registry.interfaces.person import PersonVisibility
-from lp.registry.interfaces.role import IPersonRoles
-from lp.registry.interfaces.teammembership import (
-    ITeamMembershipSet,
-    TeamMembershipStatus,
-    )
-from lp.security import PublicOrPrivateTeamsExistence
 
 
 def registerFakeSecurityAdapter(interface, permission, adapter=None):

=== modified file 'lib/lp/app/tests/test_services.py'
--- lib/lp/app/tests/test_services.py	2012-02-23 23:14:10 +0000
+++ lib/lp/app/tests/test_services.py	2012-02-28 04:31:37 +0000
@@ -3,18 +3,20 @@
 
 """Tests for core services infrastructure."""
 
+from lazr.restful.interfaces._rest import IHTTPResource
 from zope.component import getUtility
 from zope.interface.declarations import implements
 
-from lazr.restful.interfaces._rest import IHTTPResource
-
-from lp.app.interfaces.services import IService, IServiceFactory
+from lp.app.interfaces.services import (
+    IService,
+    IServiceFactory,
+    )
 from lp.services.webapp.interaction import ANONYMOUS
 from lp.testing import (
     FakeAdapterMixin,
+    login,
     TestCaseWithFactory,
     )
-from lp.testing import login
 from lp.testing.layers import DatabaseFunctionalLayer
 from lp.testing.publication import test_traverse
 

=== modified file 'lib/lp/app/widgets/tests/test_itemswidgets.py'
--- lib/lp/app/widgets/tests/test_itemswidgets.py	2012-02-17 02:36:05 +0000
+++ lib/lp/app/widgets/tests/test_itemswidgets.py	2012-02-28 04:31:37 +0000
@@ -1,10 +1,16 @@
 # Copyright 2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 from unittest import TestCase
-from lazr.enum._enum import DBEnumeratedType, DBItem
+
+from lazr.enum._enum import (
+    DBEnumeratedType,
+    DBItem,
+    )
+
 from lp.app.browser.lazrjs import vocabulary_to_choice_edit_items
 from lp.services.features.testing import FeatureFixture
 
+
 __metaclass__ = type
 
 import doctest

=== modified file 'lib/lp/archivepublisher/scripts/publish_ftpmaster.py'
--- lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2012-01-19 03:09:38 +0000
+++ lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2012-02-28 04:31:37 +0000
@@ -28,9 +28,9 @@
 from lp.services.utils import file_exists
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.scripts.custom_uploads_copier import CustomUploadsCopier
-from lp.soyuz.scripts.querydistro import LpQueryDistro
 from lp.soyuz.scripts.processaccepted import ProcessAccepted
 from lp.soyuz.scripts.publishdistro import PublishDistro
+from lp.soyuz.scripts.querydistro import LpQueryDistro
 
 
 def get_publishable_archives(distribution):

=== modified file 'lib/lp/blueprints/interfaces/specification.py'
--- lib/lp/blueprints/interfaces/specification.py	2012-02-20 13:34:23 +0000
+++ lib/lp/blueprints/interfaces/specification.py	2012-02-28 04:31:37 +0000
@@ -65,7 +65,7 @@
     ISpecificationTarget,
     )
 from lp.blueprints.interfaces.specificationworkitem import (
-    ISpecificationWorkItem
+    ISpecificationWorkItem,
     )
 from lp.blueprints.interfaces.sprint import ISprint
 from lp.bugs.interfaces.buglink import IBugLinkTarget

=== modified file 'lib/lp/blueprints/model/specificationworkitem.py'
--- lib/lp/blueprints/model/specificationworkitem.py	2012-02-20 13:34:23 +0000
+++ lib/lp/blueprints/model/specificationworkitem.py	2012-02-28 04:31:37 +0000
@@ -6,26 +6,24 @@
     'SpecificationWorkItem',
     ]
 
-from zope.interface import implements
-
 from storm.locals import (
     Bool,
     Int,
     Reference,
     Unicode,
     )
+from zope.interface import implements
 
+from lp.blueprints.enums import SpecificationWorkItemStatus
+from lp.blueprints.interfaces.specificationworkitem import (
+    ISpecificationWorkItem,
+    )
+from lp.registry.interfaces.person import validate_public_person
 from lp.services.database.constants import DEFAULT
 from lp.services.database.datetimecol import UtcDateTimeCol
 from lp.services.database.enumcol import EnumCol
 from lp.services.database.stormbase import StormBase
 
-from lp.blueprints.enums import SpecificationWorkItemStatus
-from lp.blueprints.interfaces.specificationworkitem import (
-    ISpecificationWorkItem,
-    )
-from lp.registry.interfaces.person import validate_public_person
-
 
 class SpecificationWorkItem(StormBase):
     implements(ISpecificationWorkItem)

=== modified file 'lib/lp/blueprints/model/tests/test_specification.py'
--- lib/lp/blueprints/model/tests/test_specification.py	2012-02-20 14:19:42 +0000
+++ lib/lp/blueprints/model/tests/test_specification.py	2012-02-28 04:31:37 +0000
@@ -9,6 +9,7 @@
     Equals,
     MatchesStructure,
     )
+from zope.security.interfaces import Unauthorized
 
 from lp.app.validators import LaunchpadValidationError
 from lp.blueprints.interfaces.specification import ISpecification
@@ -18,13 +19,12 @@
 from lp.blueprints.model.specificationworkitem import SpecificationWorkItem
 from lp.services.webapp import canonical_url
 from lp.testing import (
-    TestCaseWithFactory,
     ANONYMOUS,
     login,
     login_person,
+    TestCaseWithFactory,
     )
 from lp.testing.layers import DatabaseFunctionalLayer
-from zope.security.interfaces import Unauthorized
 
 
 class TestSpecificationDependencies(TestCaseWithFactory):

=== modified file 'lib/lp/bugs/browser/bugcomment.py'
--- lib/lp/bugs/browser/bugcomment.py	2012-02-01 15:26:32 +0000
+++ lib/lp/bugs/browser/bugcomment.py	2012-02-28 04:31:37 +0000
@@ -46,6 +46,7 @@
 from lp.services.config import config
 from lp.services.features import getFeatureFlag
 from lp.services.librarian.browser import ProxiedLibraryFileAlias
+from lp.services.messages.interfaces.message import IMessage
 from lp.services.propertycache import (
     cachedproperty,
     get_property_cache,
@@ -54,7 +55,6 @@
     canonical_url,
     LaunchpadView,
     )
-from lp.services.messages.interfaces.message import IMessage
 from lp.services.webapp.breadcrumb import Breadcrumb
 from lp.services.webapp.interfaces import ILaunchBag
 

=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
--- lib/lp/bugs/browser/bugsubscription.py	2012-01-05 20:11:40 +0000
+++ lib/lp/bugs/browser/bugsubscription.py	2012-02-28 04:31:37 +0000
@@ -35,6 +35,7 @@
 from lp.app.browser.launchpadform import (
     action,
     LaunchpadFormView,
+    ReturnToReferrerMixin,
     )
 from lp.bugs.browser.structuralsubscription import (
     expose_structural_subscription_data_to_js,
@@ -56,7 +57,6 @@
     check_permission,
     precache_permission_for_objects,
     )
-from lp.app.browser.launchpadform import ReturnToReferrerMixin
 from lp.services.webapp.menu import structured
 
 

=== modified file 'lib/lp/bugs/browser/bugsupervisor.py'
--- lib/lp/bugs/browser/bugsupervisor.py	2012-01-05 20:11:40 +0000
+++ lib/lp/bugs/browser/bugsupervisor.py	2012-02-28 04:31:37 +0000
@@ -12,12 +12,12 @@
 from lazr.restful.interface import copy_field
 from zope.interface import Interface
 
-from lp.bugs.browser.bugrole import BugRoleMixin
-from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
 from lp.app.browser.launchpadform import (
     action,
     LaunchpadEditFormView,
     )
+from lp.bugs.browser.bugrole import BugRoleMixin
+from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
 from lp.services.webapp.menu import structured
 from lp.services.webapp.publisher import canonical_url
 

=== modified file 'lib/lp/bugs/browser/person.py'
--- lib/lp/bugs/browser/person.py	2012-02-17 21:00:21 +0000
+++ lib/lp/bugs/browser/person.py	2012-02-28 04:31:37 +0000
@@ -22,7 +22,6 @@
 import urllib
 
 from storm.expr import Join
-
 from zope.component import getUtility
 from zope.schema.vocabulary import getVocabularyRegistry
 
@@ -34,19 +33,19 @@
     UNRESOLVED_BUGTASK_STATUSES,
     )
 from lp.bugs.model.bugtask import BugTask
+from lp.registry.interfaces.person import IPerson
 from lp.registry.model.milestone import (
     Milestone,
     milestone_sort_key,
     )
-from lp.registry.interfaces.person import IPerson
 from lp.services.feeds.browser import FeedsMixin
 from lp.services.helpers import shortlist
 from lp.services.propertycache import cachedproperty
-from lp.services.webapp.menu import  (
+from lp.services.webapp.batching import BatchNavigator
+from lp.services.webapp.menu import (
     Link,
     NavigationMenu,
     )
-from lp.services.webapp.batching import BatchNavigator
 from lp.services.webapp.publisher import (
     canonical_url,
     LaunchpadView,

=== modified file 'lib/lp/bugs/browser/tests/test_bugcomment.py'
--- lib/lp/bugs/browser/tests/test_bugcomment.py	2012-02-24 04:24:48 +0000
+++ lib/lp/bugs/browser/tests/test_bugcomment.py	2012-02-28 04:31:37 +0000
@@ -18,11 +18,11 @@
     )
 from zope.security.proxy import removeSecurityProxy
 
-from lp.bugs.interfaces.bugmessage import IBugComment
 from lp.bugs.browser.bugcomment import (
     BugComment,
     group_comments_with_activity,
     )
+from lp.bugs.interfaces.bugmessage import IBugComment
 from lp.coop.answersbugs.visibility import (
     TestHideMessageControlMixin,
     TestMessageVisibilityMixin,

=== modified file 'lib/lp/bugs/browser/tests/test_bugs.py'
--- lib/lp/bugs/browser/tests/test_bugs.py	2012-01-05 18:12:05 +0000
+++ lib/lp/bugs/browser/tests/test_bugs.py	2012-02-28 04:31:37 +0000
@@ -6,17 +6,16 @@
 __metaclass__ = type
 
 from contextlib import contextmanager
+
 from zope.component import getUtility
 
 from lp.bugs.interfaces.malone import IMaloneApplication
 from lp.bugs.publisher import BugsLayer
-from lp.testing import (
-    set_feature_flag,
-    feature_flags,
-    )
 from lp.services.webapp.publisher import canonical_url
 from lp.testing import (
     celebrity_logged_in,
+    feature_flags,
+    set_feature_flag,
     TestCaseWithFactory,
     )
 from lp.testing.layers import DatabaseFunctionalLayer

=== modified file 'lib/lp/bugs/browser/tests/test_cve.py'
--- lib/lp/bugs/browser/tests/test_cve.py	2012-01-24 15:15:18 +0000
+++ lib/lp/bugs/browser/tests/test_cve.py	2012-02-28 04:31:37 +0000
@@ -6,11 +6,11 @@
 from operator import attrgetter
 import re
 
+from lp.bugs.browser.cvereport import BugTaskCve
 from lp.bugs.interfaces.bugtask import (
     RESOLVED_BUGTASK_STATUSES,
     UNRESOLVED_BUGTASK_STATUSES,
     )
-from lp.bugs.browser.cvereport import BugTaskCve
 from lp.services.webapp.publisher import canonical_url
 from lp.testing import (
     person_logged_in,

=== modified file 'lib/lp/bugs/browser/tests/test_person_bugs.py'
--- lib/lp/bugs/browser/tests/test_person_bugs.py	2012-02-17 21:00:21 +0000
+++ lib/lp/bugs/browser/tests/test_person_bugs.py	2012-02-28 04:31:37 +0000
@@ -5,8 +5,8 @@
 
 __metaclass__ = type
 
+from lp.app.browser.tales import MenuAPI
 from lp.app.errors import UnexpectedFormData
-from lp.app.browser.tales import MenuAPI
 from lp.bugs.browser import person
 from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.testing import (

=== modified file 'lib/lp/bugs/interfaces/bugmessage.py'
--- lib/lp/bugs/interfaces/bugmessage.py	2012-02-01 15:26:32 +0000
+++ lib/lp/bugs/interfaces/bugmessage.py	2012-02-28 04:31:37 +0000
@@ -31,8 +31,8 @@
 from lp.bugs.interfaces.bugwatch import IBugWatch
 from lp.bugs.interfaces.hasbug import IHasBug
 from lp.registry.interfaces.person import IPerson
+from lp.services.comments.interfaces.conversation import IComment
 from lp.services.fields import Title
-from lp.services.comments.interfaces.conversation import IComment
 from lp.services.messages.interfaces.message import IMessage
 
 

=== modified file 'lib/lp/bugs/model/cve.py'
--- lib/lp/bugs/model/cve.py	2012-01-19 15:47:04 +0000
+++ lib/lp/bugs/model/cve.py	2012-02-28 04:31:37 +0000
@@ -19,8 +19,8 @@
     SQLRelatedJoin,
     StringCol,
     )
+from storm.expr import In
 from storm.store import Store
-from storm.expr import In
 # Zope
 from zope.interface import implements
 

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2012-02-09 23:09:36 +0000
+++ lib/lp/buildmaster/model/builder.py	2012-02-28 04:31:37 +0000
@@ -18,10 +18,9 @@
 import os
 import socket
 import tempfile
+from urlparse import urlparse
 import xmlrpclib
 
-from urlparse import urlparse
-
 from lazr.restful.utils import safe_hasattr
 from sqlobject import (
     BoolCol,

=== modified file 'lib/lp/buildmaster/tests/harness.py'
--- lib/lp/buildmaster/tests/harness.py	2011-12-24 19:06:36 +0000
+++ lib/lp/buildmaster/tests/harness.py	2012-02-28 04:31:37 +0000
@@ -13,6 +13,7 @@
 import os
 
 import canonical
+
 from lp.services.daemons.tachandler import TacTestSetup
 from lp.services.osutils import remove_tree
 

=== modified file 'lib/lp/code/browser/codereviewcomment.py'
--- lib/lp/code/browser/codereviewcomment.py	2012-02-01 19:18:30 +0000
+++ lib/lp/code/browser/codereviewcomment.py	2012-02-28 04:31:37 +0000
@@ -32,9 +32,9 @@
     )
 from lp.code.interfaces.codereviewcomment import ICodeReviewComment
 from lp.code.interfaces.codereviewvote import ICodeReviewVoteReference
-from lp.services.comments.interfaces.conversation import IComment
 from lp.services.comments.browser.comment import download_body
 from lp.services.comments.browser.messagecomment import MessageComment
+from lp.services.comments.interfaces.conversation import IComment
 from lp.services.config import config
 from lp.services.librarian.interfaces import ILibraryFileAlias
 from lp.services.propertycache import (

=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py	2012-01-04 20:16:10 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py	2012-02-28 04:31:37 +0000
@@ -26,9 +26,7 @@
     )
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.librarian.browser import FileNavigationMixin
-from lp.services.propertycache import (
-    cachedproperty,
-    )
+from lp.services.propertycache import cachedproperty
 from lp.services.webapp import (
     canonical_url,
     ContextMenu,

=== modified file 'lib/lp/code/browser/tests/test_codereviewcomment.py'
--- lib/lp/code/browser/tests/test_codereviewcomment.py	2012-02-01 15:26:32 +0000
+++ lib/lp/code/browser/tests/test_codereviewcomment.py	2012-02-28 04:31:37 +0000
@@ -5,11 +5,11 @@
 
 __metaclass__ = type
 
-from testtools.matchers import Not
 from soupmatchers import (
     HTMLContains,
     Tag,
     )
+from testtools.matchers import Not
 
 from lp.code.browser.codereviewcomment import (
     CodeReviewDisplayComment,

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2012-02-21 22:46:28 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2012-02-28 04:31:37 +0000
@@ -39,9 +39,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.database.constants import UTC_NOW
-from lp.services.propertycache import (
-    clear_property_cache,
-    )
+from lp.services.propertycache import clear_property_cache
 from lp.services.webapp import canonical_url
 from lp.services.webapp.interfaces import ILaunchpadRoot
 from lp.services.webapp.servers import LaunchpadTestRequest

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-02-27 04:29:39 +0000
+++ lib/lp/code/model/branch.py	2012-02-28 04:31:37 +0000
@@ -133,9 +133,7 @@
     validate_public_person,
     )
 from lp.services.config import config
-from lp.services.database.bulk import (
-    load_related,
-    )
+from lp.services.database.bulk import load_related
 from lp.services.database.constants import (
     DEFAULT,
     UTC_NOW,

=== modified file 'lib/lp/code/model/branchmergeproposal.py'
--- lib/lp/code/model/branchmergeproposal.py	2012-01-24 11:27:42 +0000
+++ lib/lp/code/model/branchmergeproposal.py	2012-02-28 04:31:37 +0000
@@ -42,8 +42,8 @@
     BranchMergeProposalStatus,
     BranchSubscriptionDiffSize,
     BranchSubscriptionNotificationLevel,
+    CodeReviewNotificationLevel,
     CodeReviewVote,
-    CodeReviewNotificationLevel,
     )
 from lp.code.errors import (
     BadBranchMergeProposalSearchContext,

=== modified file 'lib/lp/code/model/tests/test_revision.py'
--- lib/lp/code/model/tests/test_revision.py	2012-02-22 17:54:59 +0000
+++ lib/lp/code/model/tests/test_revision.py	2012-02-28 04:31:37 +0000
@@ -9,13 +9,13 @@
     datetime,
     timedelta,
     )
-from testtools.matchers import Equals
 import time
 from unittest import TestCase
 
 import psycopg2
 import pytz
 from storm.store import Store
+from testtools.matchers import Equals
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
@@ -28,9 +28,7 @@
     )
 from lp.registry.model.karma import Karma
 from lp.scripts.garbo import RevisionAuthorEmailLinker
-from lp.services.database.lpstorm import (
-    IMasterObject,
-    )
+from lp.services.database.lpstorm import IMasterObject
 from lp.services.database.sqlbase import cursor
 from lp.services.identity.interfaces.account import AccountStatus
 from lp.services.log.logger import DevNullLogger

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2012-02-03 22:03:43 +0000
+++ lib/lp/registry/browser/__init__.py	2012-02-28 04:31:37 +0000
@@ -24,6 +24,10 @@
 from zope.component import getUtility
 
 from lp.app.browser.folder import ExportedFolder
+from lp.app.browser.launchpadform import (
+    action,
+    LaunchpadEditFormView,
+    )
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.bugs.interfaces.bugtask import (
     BugTaskSearchParams,
@@ -31,10 +35,6 @@
     )
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.series import SeriesStatus
-from lp.app.browser.launchpadform import (
-    action,
-    LaunchpadEditFormView,
-    )
 from lp.services.webapp.publisher import (
     canonical_url,
     DataDownloadView,

=== modified file 'lib/lp/registry/browser/branding.py'
--- lib/lp/registry/browser/branding.py	2012-01-05 20:11:40 +0000
+++ lib/lp/registry/browser/branding.py	2012-02-28 04:31:37 +0000
@@ -9,12 +9,12 @@
     'BrandingChangeView',
     ]
 
-from lp.app.widgets.image import ImageChangeWidget
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
     LaunchpadEditFormView,
     )
+from lp.app.widgets.image import ImageChangeWidget
 from lp.services.webapp import canonical_url
 
 

=== modified file 'lib/lp/registry/browser/distroseriesdifference.py'
--- lib/lp/registry/browser/distroseriesdifference.py	2012-02-01 15:26:32 +0000
+++ lib/lp/registry/browser/distroseriesdifference.py	2012-02-28 04:31:37 +0000
@@ -26,7 +26,10 @@
     SimpleVocabulary,
     )
 
-from lp.app.browser.launchpadform import LaunchpadFormView
+from lp.app.browser.launchpadform import (
+    custom_widget,
+    LaunchpadFormView,
+    )
 from lp.registry.enums import (
     DistroSeriesDifferenceStatus,
     DistroSeriesDifferenceType,
@@ -41,11 +44,11 @@
 from lp.registry.model.distroseriesdifferencecomment import (
     DistroSeriesDifferenceComment,
     )
+from lp.services.comments.browser.messagecomment import MessageComment
 from lp.services.comments.interfaces.conversation import (
     IComment,
     IConversation,
     )
-from lp.services.comments.browser.messagecomment import MessageComment
 from lp.services.propertycache import cachedproperty
 from lp.services.webapp import (
     LaunchpadView,
@@ -53,7 +56,6 @@
     stepthrough,
     )
 from lp.services.webapp.authorization import check_permission
-from lp.app.browser.launchpadform import custom_widget
 
 
 class DistroSeriesDifferenceNavigation(Navigation):

=== modified file 'lib/lp/registry/browser/driver.py'
--- lib/lp/registry/browser/driver.py	2012-01-05 20:11:40 +0000
+++ lib/lp/registry/browser/driver.py	2012-02-28 04:31:37 +0000
@@ -13,7 +13,6 @@
     action,
     LaunchpadEditFormView,
     )
-
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.role import IHasAppointedDriver
 from lp.services.webapp.publisher import canonical_url

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2012-02-24 06:33:10 +0000
+++ lib/lp/registry/browser/product.py	2012-02-28 04:31:37 +0000
@@ -52,8 +52,8 @@
 from operator import attrgetter
 
 from lazr.delegates import delegates
+from lazr.restful import ResourceJSONEncoder
 from lazr.restful.interface import copy_field
-from lazr.restful import ResourceJSONEncoder
 import pytz
 import simplejson
 from z3c.ptcompat import ViewPageTemplateFile

=== modified file 'lib/lp/registry/browser/tests/test_person.py'
--- lib/lp/registry/browser/tests/test_person.py	2012-02-21 22:46:28 +0000
+++ lib/lp/registry/browser/tests/test_person.py	2012-02-28 04:31:37 +0000
@@ -3,8 +3,8 @@
 
 __metaclass__ = type
 
+import doctest
 from textwrap import dedent
-import doctest
 
 import soupmatchers
 from storm.expr import LeftJoin
@@ -68,9 +68,7 @@
     LaunchpadZopelessLayer,
     )
 from lp.testing.matchers import HasQueryCount
-from lp.testing.pages import (
-    extract_text,
-    )
+from lp.testing.pages import extract_text
 from lp.testing.views import (
     create_initialized_view,
     create_view,

=== modified file 'lib/lp/registry/browser/tests/test_team.py'
--- lib/lp/registry/browser/tests/test_team.py	2012-02-21 22:46:28 +0000
+++ lib/lp/registry/browser/tests/test_team.py	2012-02-28 04:31:37 +0000
@@ -4,6 +4,7 @@
 __metaclass__ = type
 
 import contextlib
+
 from lazr.restful.interfaces import IJSONRequestCache
 import simplejson
 import transaction
@@ -12,8 +13,8 @@
 
 from lp.registry.browser.team import (
     TeamIndexMenu,
+    TeamMailingListArchiveView,
     TeamOverviewMenu,
-    TeamMailingListArchiveView,
     )
 from lp.registry.interfaces.mailinglist import MailingListStatus
 from lp.registry.interfaces.person import (

=== modified file 'lib/lp/registry/interfaces/webservice.py'
--- lib/lp/registry/interfaces/webservice.py	2012-02-23 10:13:48 +0000
+++ lib/lp/registry/interfaces/webservice.py	2012-02-28 04:31:37 +0000
@@ -43,6 +43,9 @@
 # XXX: JonathanLange 2010-11-09 bug=673083: Legacy work-around for circular
 # import bugs.  Break this up into a per-package thing.
 from lp import _schema_circular_imports
+# Services
+from lp.app.interfaces.services import IServiceFactory
+from lp.registry.interfaces.accesspolicyservice import IAccessPolicyService
 from lp.registry.interfaces.commercialsubscription import (
     ICommercialSubscription,
     )
@@ -102,9 +105,5 @@
 from lp.registry.interfaces.teammembership import ITeamMembership
 from lp.registry.interfaces.wikiname import IWikiName
 
-# Services
-from lp.app.interfaces.services import IServiceFactory
-from lp.registry.interfaces.accesspolicyservice import IAccessPolicyService
-
 
 _schema_circular_imports

=== modified file 'lib/lp/registry/model/milestonetag.py'
--- lib/lp/registry/model/milestonetag.py	2012-01-04 12:08:24 +0000
+++ lib/lp/registry/model/milestonetag.py	2012-02-28 04:31:37 +0000
@@ -10,24 +10,26 @@
     ]
 
 
+from storm.locals import (
+    DateTime,
+    Int,
+    Reference,
+    Unicode,
+    )
+from zope.component import getUtility
 from zope.interface import implements
-from zope.component import getUtility
 
+from lp.blueprints.model.specification import Specification
+from lp.registry.interfaces.milestonetag import IProjectGroupMilestoneTag
+from lp.registry.model.milestone import (
+    Milestone,
+    MilestoneData,
+    )
+from lp.registry.model.product import Product
 from lp.services.webapp.interfaces import (
+    DEFAULT_FLAVOR,
     IStoreSelector,
     MAIN_STORE,
-    DEFAULT_FLAVOR,
-    )
-
-from lp.blueprints.model.specification import Specification
-from lp.registry.interfaces.milestonetag import IProjectGroupMilestoneTag
-from lp.registry.model.milestone import MilestoneData, Milestone
-from lp.registry.model.product import Product
-from storm.locals import (
-    DateTime,
-    Int,
-    Unicode,
-    Reference,
     )
 
 

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2012-02-24 04:29:13 +0000
+++ lib/lp/registry/model/person.py	2012-02-28 04:31:37 +0000
@@ -44,7 +44,6 @@
     get_current_browser_request,
     smartquote,
     )
-
 import pytz
 from sqlobject import (
     BoolCol,

=== modified file 'lib/lp/registry/services/accesspolicyservice.py'
--- lib/lp/registry/services/accesspolicyservice.py	2012-02-24 06:33:10 +0000
+++ lib/lp/registry/services/accesspolicyservice.py	2012-02-28 04:31:37 +0000
@@ -8,14 +8,12 @@
     'AccessPolicyService',
     ]
 
+from lazr.restful import ResourceJSONEncoder
 import simplejson
-from lazr.restful import ResourceJSONEncoder
 from zope.interface import implements
 
 from lp.registry.enums import AccessPolicyType
-from lp.registry.interfaces.accesspolicyservice import (
-    IAccessPolicyService,
-    )
+from lp.registry.interfaces.accesspolicyservice import IAccessPolicyService
 
 
 class AccessPolicyService:

=== modified file 'lib/lp/registry/services/tests/test_accesspolicyservice.py'
--- lib/lp/registry/services/tests/test_accesspolicyservice.py	2012-02-24 06:33:10 +0000
+++ lib/lp/registry/services/tests/test_accesspolicyservice.py	2012-02-28 04:31:37 +0000
@@ -5,14 +5,16 @@
 
 
 import simplejson
-
 from zope.component import getUtility
 
 from lp.registry.enums import AccessPolicyType
 from lp.registry.services.accesspolicyservice import AccessPolicyService
 from lp.services.webapp.interfaces import ILaunchpadRoot
 from lp.services.webapp.publisher import canonical_url
-from lp.testing import WebServiceTestCase, TestCaseWithFactory
+from lp.testing import (
+    TestCaseWithFactory,
+    WebServiceTestCase,
+    )
 from lp.testing.layers import AppServerLayer
 from lp.testing.pages import LaunchpadWebServiceCaller
 

=== modified file 'lib/lp/registry/tests/test_commercialprojects_vocabularies.py'
--- lib/lp/registry/tests/test_commercialprojects_vocabularies.py	2012-02-21 22:46:28 +0000
+++ lib/lp/registry/tests/test_commercialprojects_vocabularies.py	2012-02-28 04:31:37 +0000
@@ -6,9 +6,7 @@
 __metaclass__ = type
 
 from lp.app.browser.tales import DateTimeFormatterAPI
-from lp.registry.interfaces.product import (
-    License,
-    )
+from lp.registry.interfaces.product import License
 from lp.registry.vocabularies import CommercialProjectsVocabulary
 from lp.services.identity.interfaces.emailaddress import EmailAddressStatus
 from lp.testing import (

=== modified file 'lib/lp/registry/tests/test_distributionmirror_prober.py'
--- lib/lp/registry/tests/test_distributionmirror_prober.py	2012-01-01 02:58:52 +0000
+++ lib/lp/registry/tests/test_distributionmirror_prober.py	2012-02-28 04:31:37 +0000
@@ -12,6 +12,7 @@
 import os
 from StringIO import StringIO
 
+import canonical
 from lazr.uri import URI
 from sqlobject import SQLObjectNotFound
 from twisted.internet import (
@@ -24,7 +25,6 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
-import canonical
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.model.distributionmirror import DistributionMirror

=== modified file 'lib/lp/registry/tests/test_milestone.py'
--- lib/lp/registry/tests/test_milestone.py	2012-01-05 15:02:29 +0000
+++ lib/lp/registry/tests/test_milestone.py	2012-02-28 04:31:37 +0000
@@ -18,10 +18,10 @@
     )
 from lp.registry.interfaces.product import IProductSet
 from lp.testing import (
-    person_logged_in,
     ANONYMOUS,
     login,
     logout,
+    person_logged_in,
     TestCaseWithFactory,
     )
 from lp.testing.layers import (

=== modified file 'lib/lp/registry/tests/test_milestonetag.py'
--- lib/lp/registry/tests/test_milestonetag.py	2012-01-16 00:07:45 +0000
+++ lib/lp/registry/tests/test_milestonetag.py	2012-02-28 04:31:37 +0000
@@ -6,12 +6,9 @@
 __metaclass__ = type
 
 import datetime
+
 import transaction
 
-from lp.testing.layers import (
-    AppServerLayer,
-    DatabaseFunctionalLayer,
-    )
 from lp.registry.model.milestonetag import (
     MilestoneTag,
     ProjectGroupMilestoneTag,
@@ -21,6 +18,10 @@
     TestCaseWithFactory,
     WebServiceTestCase,
     )
+from lp.testing.layers import (
+    AppServerLayer,
+    DatabaseFunctionalLayer,
+    )
 
 
 class MilestoneTagTest(TestCaseWithFactory):

=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2012-02-22 15:59:10 +0000
+++ lib/lp/registry/tests/test_person.py	2012-02-28 04:31:37 +0000
@@ -7,7 +7,6 @@
 
 from lazr.lifecycle.snapshot import Snapshot
 from lazr.restful.utils import smartquote
-
 import pytz
 from storm.store import Store
 from testtools.matchers import (

=== modified file 'lib/lp/registry/tests/test_personset.py'
--- lib/lp/registry/tests/test_personset.py	2012-02-21 09:28:48 +0000
+++ lib/lp/registry/tests/test_personset.py	2012-02-28 04:31:37 +0000
@@ -7,15 +7,12 @@
 
 from datetime import datetime
 
-import transaction
-
 import pytz
-
 from testtools.matchers import (
     LessThan,
     MatchesStructure,
     )
-
+import transaction
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
@@ -62,9 +59,7 @@
 from lp.services.identity.model.account import Account
 from lp.services.identity.model.emailaddress import EmailAddress
 from lp.services.openid.model.openididentifier import OpenIdIdentifier
-from lp.soyuz.enums import (
-    ArchiveStatus,
-    )
+from lp.soyuz.enums import ArchiveStatus
 from lp.testing import (
     ANONYMOUS,
     celebrity_logged_in,
@@ -76,7 +71,6 @@
     TestCase,
     TestCaseWithFactory,
     )
-
 from lp.testing.dbuser import dbuser
 from lp.testing.layers import DatabaseFunctionalLayer
 from lp.testing.matchers import HasQueryCount

=== modified file 'lib/lp/registry/tests/test_product.py'
--- lib/lp/registry/tests/test_product.py	2012-02-15 00:57:40 +0000
+++ lib/lp/registry/tests/test_product.py	2012-02-28 04:31:37 +0000
@@ -2,6 +2,7 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 from lp.services.webapp.interaction import ANONYMOUS
 
+
 __metaclass__ = type
 
 from cStringIO import StringIO

=== modified file 'lib/lp/scripts/garbo.py'
--- lib/lp/scripts/garbo.py	2012-02-21 07:09:37 +0000
+++ lib/lp/scripts/garbo.py	2012-02-28 04:31:37 +0000
@@ -13,7 +13,6 @@
     datetime,
     timedelta,
     )
-import iso8601
 import logging
 import multiprocessing
 import os
@@ -24,6 +23,7 @@
     GlobalLock,
     LockAlreadyAcquired,
     )
+import iso8601
 from psycopg2 import IntegrityError
 import pytz
 from pytz import timezone

=== modified file 'lib/lp/services/comments/browser/comment.py'
--- lib/lp/services/comments/browser/comment.py	2012-01-27 18:56:36 +0000
+++ lib/lp/services/comments/browser/comment.py	2012-02-28 04:31:37 +0000
@@ -14,7 +14,7 @@
 from lp.services.webapp.publisher import (
     DataDownloadView,
     LaunchpadView,
-    UserAttributeCache
+    UserAttributeCache,
     )
 
 

=== modified file 'lib/lp/services/comments/browser/tests/test_comment.py'
--- lib/lp/services/comments/browser/tests/test_comment.py	2012-01-31 14:10:33 +0000
+++ lib/lp/services/comments/browser/tests/test_comment.py	2012-02-28 04:31:37 +0000
@@ -1,10 +1,10 @@
+from lp.services.comments.browser.comment import CommentBodyDownloadView
+from lp.services.webapp.servers import LaunchpadTestRequest
 from lp.testing import (
     person_logged_in,
     TestCaseWithFactory,
-)
+    )
 from lp.testing.layers import DatabaseFunctionalLayer
-from lp.services.comments.browser.comment import CommentBodyDownloadView
-from lp.services.webapp.servers import LaunchpadTestRequest
 
 
 class FakeComment:

=== modified file 'lib/lp/services/database/bulk.py'
--- lib/lp/services/database/bulk.py	2012-02-27 04:29:39 +0000
+++ lib/lp/services/database/bulk.py	2012-02-28 04:31:37 +0000
@@ -14,8 +14,8 @@
 
 
 from collections import defaultdict
+from functools import partial
 from itertools import chain
-from functools import partial
 from operator import (
     attrgetter,
     itemgetter,

=== modified file 'lib/lp/services/librarianserver/testing/server.py'
--- lib/lp/services/librarianserver/testing/server.py	2011-12-30 01:48:17 +0000
+++ lib/lp/services/librarianserver/testing/server.py	2012-02-28 04:31:37 +0000
@@ -15,12 +15,12 @@
 from textwrap import dedent
 import warnings
 
+import canonical
 from fixtures import (
     Fixture,
     FunctionFixture,
     )
 
-import canonical
 from lp.services.config import config
 from lp.services.daemons.tachandler import (
     TacException,

=== modified file 'lib/lp/services/scripts/tests/__init__.py'
--- lib/lp/services/scripts/tests/__init__.py	2011-12-29 05:29:36 +0000
+++ lib/lp/services/scripts/tests/__init__.py	2012-02-28 04:31:37 +0000
@@ -11,6 +11,7 @@
 import subprocess
 
 import canonical
+
 from lp.services.config import config
 
 

=== modified file 'lib/lp/services/webapp/tests/test_authentication.py'
--- lib/lp/services/webapp/tests/test_authentication.py	2012-01-03 12:37:44 +0000
+++ lib/lp/services/webapp/tests/test_authentication.py	2012-02-28 04:31:37 +0000
@@ -9,6 +9,7 @@
 import unittest
 
 from contrib.oauth import OAuthRequest
+
 from lp.testing import TestCaseWithFactory
 from lp.testing.layers import (
     DatabaseFunctionalLayer,

=== modified file 'lib/lp/soyuz/model/archivesubscriber.py'
--- lib/lp/soyuz/model/archivesubscriber.py	2012-01-26 17:58:49 +0000
+++ lib/lp/soyuz/model/archivesubscriber.py	2012-02-28 04:31:37 +0000
@@ -10,6 +10,7 @@
     ]
 
 from operator import itemgetter
+
 import pytz
 from storm.expr import (
     And,

=== modified file 'lib/lp/soyuz/model/binarypackagename.py'
--- lib/lp/soyuz/model/binarypackagename.py	2012-01-17 08:48:04 +0000
+++ lib/lp/soyuz/model/binarypackagename.py	2012-02-28 04:31:37 +0000
@@ -15,8 +15,8 @@
     SQLObjectNotFound,
     StringCol,
     )
+from storm.expr import Join
 from storm.store import EmptyResultSet
-from storm.expr import Join
 from zope.interface import implements
 from zope.schema.vocabulary import SimpleTerm
 

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py	2012-01-05 20:11:40 +0000
+++ lib/lp/translations/browser/distroseries.py	2012-02-28 04:31:37 +0000
@@ -16,16 +16,16 @@
 
 from zope.component import getUtility
 
+from lp.app.browser.launchpadform import (
+    action,
+    LaunchpadEditFormView,
+    )
 from lp.app.enums import service_uses_launchpad
 from lp.app.errors import TranslationUnavailable
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.propertycache import cachedproperty
 from lp.services.webapp.authorization import check_permission
-from lp.app.browser.launchpadform import (
-    action,
-    LaunchpadEditFormView,
-    )
 from lp.services.webapp.menu import (
     enabled_with_permission,
     Link,

=== modified file 'lib/lp/translations/browser/project.py'
--- lib/lp/translations/browser/project.py	2012-01-05 20:11:40 +0000
+++ lib/lp/translations/browser/project.py	2012-02-28 04:31:37 +0000
@@ -11,9 +11,7 @@
     'ProjectView',
     ]
 
-from lp.app.browser.launchpadform import (
-    action,
-    )
+from lp.app.browser.launchpadform import action
 from lp.registry.browser.project import ProjectEditView
 from lp.registry.interfaces.projectgroup import IProjectGroup
 from lp.services.webapp import (