launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #10946
[Merge] lp:~stevenk/launchpad/format-imports-and-again into lp:launchpad
Steve Kowalik has proposed merging lp:~stevenk/launchpad/format-imports-and-again into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~stevenk/launchpad/format-imports-and-again/+merge/119645
Run format-imports lib/lp over the tree again. Reap the LoC savings for my very own.
--
https://code.launchpad.net/~stevenk/launchpad/format-imports-and-again/+merge/119645
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/format-imports-and-again into lp:launchpad.
=== modified file 'lib/lp/app/browser/root.py'
--- lib/lp/app/browser/root.py 2012-08-14 09:04:45 +0000
+++ lib/lp/app/browser/root.py 2012-08-14 23:32:21 +0000
@@ -39,11 +39,11 @@
from lp.registry.interfaces.pillar import IPillarNameSet
from lp.registry.interfaces.product import IProductSet
from lp.services.config import config
+from lp.services.features import getFeatureFlag
from lp.services.googlesearch.interfaces import (
GoogleResponseError,
ISearchService,
)
-from lp.services.features import getFeatureFlag
from lp.services.propertycache import cachedproperty
from lp.services.statistics.interfaces.statistic import ILaunchpadStatisticSet
from lp.services.timeout import urlfetch
=== modified file 'lib/lp/app/browser/tests/test_launchpad.py'
--- lib/lp/app/browser/tests/test_launchpad.py 2012-08-13 21:33:47 +0000
+++ lib/lp/app/browser/tests/test_launchpad.py 2012-08-14 23:32:21 +0000
@@ -24,9 +24,7 @@
InformationType,
PersonVisibility,
)
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.services.identity.interfaces.account import AccountStatus
from lp.services.webapp import canonical_url
from lp.services.webapp.interfaces import (
=== modified file 'lib/lp/app/tests/test_security.py'
--- lib/lp/app/tests/test_security.py 2012-08-13 21:33:47 +0000
+++ lib/lp/app/tests/test_security.py 2012-08-14 23:32:21 +0000
@@ -17,12 +17,8 @@
AuthorizationBase,
DelegatedAuthorization,
)
-from lp.registry.enums import (
- PersonVisibility,
- )
-from lp.registry.interfaces.person import (
- IPerson,
- )
+from lp.registry.enums import PersonVisibility
+from lp.registry.interfaces.person import IPerson
from lp.registry.interfaces.role import IPersonRoles
from lp.registry.interfaces.teammembership import (
ITeamMembershipSet,
=== modified file 'lib/lp/bugs/browser/tests/test_bugsubscription_views.py'
--- lib/lp/bugs/browser/tests/test_bugsubscription_views.py 2012-08-13 21:33:47 +0000
+++ lib/lp/bugs/browser/tests/test_bugsubscription_views.py 2012-08-14 23:32:21 +0000
@@ -24,9 +24,7 @@
PersonVisibility,
TeamMembershipPolicy,
)
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.services.webapp import canonical_url
from lp.services.webapp.servers import LaunchpadTestRequest
from lp.testing import (
=== modified file 'lib/lp/bugs/browser/tests/test_bugsupervisor.py'
--- lib/lp/bugs/browser/tests/test_bugsupervisor.py 2012-08-13 21:33:47 +0000
+++ lib/lp/bugs/browser/tests/test_bugsupervisor.py 2012-08-14 23:32:21 +0000
@@ -9,12 +9,8 @@
from zope.component import getUtility
from lp.bugs.browser.bugsupervisor import BugSupervisorEditSchema
-from lp.registry.enums import (
- PersonVisibility,
- )
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.enums import PersonVisibility
+from lp.registry.interfaces.person import IPersonSet
from lp.services.webapp.publisher import canonical_url
from lp.testing import (
BrowserTestCase,
=== modified file 'lib/lp/bugs/externalbugtracker/tests/test_debbugs.py'
--- lib/lp/bugs/externalbugtracker/tests/test_debbugs.py 2012-08-09 16:14:41 +0000
+++ lib/lp/bugs/externalbugtracker/tests/test_debbugs.py 2012-08-14 23:32:21 +0000
@@ -25,10 +25,7 @@
SummaryParseError,
SummaryVersionError,
)
-
-from lp.testing import (
- TestCase,
- )
+from lp.testing import TestCase
class TestDebBugs(TestCase):
=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
--- lib/lp/bugs/model/tests/test_bugtask.py 2012-08-13 21:04:17 +0000
+++ lib/lp/bugs/model/tests/test_bugtask.py 2012-08-14 23:32:21 +0000
@@ -70,9 +70,7 @@
IDistributionSourcePackage,
)
from lp.registry.interfaces.distroseries import IDistroSeriesSet
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.product import IProductSet
from lp.registry.interfaces.projectgroup import IProjectGroupSet
from lp.registry.interfaces.sourcepackage import ISourcePackage
=== modified file 'lib/lp/bugs/subscribers/bugactivity.py'
--- lib/lp/bugs/subscribers/bugactivity.py 2012-08-13 21:33:47 +0000
+++ lib/lp/bugs/subscribers/bugactivity.py 2012-08-14 23:32:21 +0000
@@ -20,13 +20,9 @@
)
from lp.bugs.interfaces.bug import IBug
from lp.bugs.interfaces.bugactivity import IBugActivitySet
-from lp.registry.enums import (
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.milestone import IMilestone
-from lp.registry.interfaces.person import (
- IPerson,
- )
+from lp.registry.interfaces.person import IPerson
from lp.registry.interfaces.productrelease import IProductRelease
from lp.services.database.constants import UTC_NOW
from lp.services.database.sqlbase import block_implicit_flushes
=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py 2012-08-13 21:33:47 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py 2012-08-14 23:32:21 +0000
@@ -32,9 +32,7 @@
from lp.code.model.seriessourcepackagebranch import (
SeriesSourcePackageBranchSet,
)
-from lp.registry.enums import (
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.person import (
IPerson,
IPersonSet,
=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
--- lib/lp/code/browser/tests/test_branchmergeproposal.py 2012-08-13 21:33:47 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposal.py 2012-08-14 23:32:21 +0000
@@ -55,8 +55,8 @@
)
from lp.registry.enums import (
InformationType,
+ PersonVisibility,
TeamMembershipPolicy,
- PersonVisibility,
)
from lp.services.messages.model.message import MessageSet
from lp.services.webapp import canonical_url
=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
--- lib/lp/code/model/tests/test_branchmergeproposal.py 2012-08-13 21:04:17 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposal.py 2012-08-14 23:32:21 +0000
@@ -66,9 +66,7 @@
InformationType,
TeamMembershipPolicy,
)
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.product import IProductSet
from lp.services.database.constants import UTC_NOW
from lp.services.webapp import canonical_url
=== modified file 'lib/lp/codehosting/tests/servers.py'
--- lib/lp/codehosting/tests/servers.py 2012-08-13 21:04:17 +0000
+++ lib/lp/codehosting/tests/servers.py 2012-08-14 23:32:21 +0000
@@ -23,12 +23,8 @@
from twisted.python.util import sibpath
from zope.component import getUtility
-from lp.registry.enums import (
- TeamMembershipPolicy,
- )
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.enums import TeamMembershipPolicy
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.ssh import ISSHKeySet
from lp.services.config import config
from lp.services.daemons.tachandler import TacTestSetup
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2012-08-13 21:33:47 +0000
+++ lib/lp/registry/browser/person.py 2012-08-14 23:32:21 +0000
@@ -160,9 +160,7 @@
TopLevelMenuMixin,
)
from lp.registry.browser.teamjoin import TeamJoinMixin
-from lp.registry.enums import (
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.codeofconduct import ISignedCodeOfConductSet
from lp.registry.interfaces.gpg import IGPGKeySet
from lp.registry.interfaces.irc import IIrcIDSet
=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/browser/pillar.py 2012-08-14 23:32:21 +0000
@@ -55,9 +55,7 @@
IDistributionSourcePackage,
)
from lp.registry.interfaces.distroseries import IDistroSeries
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.pillar import IPillar
from lp.registry.interfaces.projectgroup import IProjectGroup
from lp.registry.model.pillar import PillarPerson
=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py 2012-08-14 13:53:51 +0000
+++ lib/lp/registry/browser/team.py 2012-08-14 23:32:21 +0000
@@ -47,8 +47,8 @@
import simplejson
from z3c.ptcompat import ViewPageTemplateFile
from zope.app.form.browser import TextAreaWidget
+from zope.app.form.browser.textwidgets import IntWidget
from zope.component import getUtility
-from zope.app.form.browser.textwidgets import IntWidget
from zope.formlib.form import (
Fields,
FormField,
@@ -113,8 +113,8 @@
EXCLUSIVE_TEAM_POLICY,
INCLUSIVE_TEAM_POLICY,
PersonVisibility,
+ TeamMembershipPolicy,
TeamMembershipRenewalPolicy,
- TeamMembershipPolicy,
)
from lp.registry.errors import TeamMembershipPolicyError
from lp.registry.interfaces.mailinglist import (
=== modified file 'lib/lp/registry/browser/tests/test_peoplemerge.py'
--- lib/lp/registry/browser/tests/test_peoplemerge.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/browser/tests/test_peoplemerge.py 2012-08-14 23:32:21 +0000
@@ -10,9 +10,7 @@
InformationType,
TeamMembershipPolicy,
)
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
from lp.testing import (
login_celebrity,
=== modified file 'lib/lp/registry/browser/tests/test_person.py'
--- lib/lp/registry/browser/tests/test_person.py 2012-08-13 21:33:47 +0000
+++ lib/lp/registry/browser/tests/test_person.py 2012-08-14 23:32:21 +0000
@@ -24,13 +24,9 @@
from lp.buildmaster.enums import BuildStatus
from lp.registry.browser.person import PersonView
from lp.registry.browser.team import TeamInvitationView
-from lp.registry.enums import (
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.karma import IKarmaCacheManager
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.registry.interfaces.teammembership import (
=== modified file 'lib/lp/registry/browser/tests/test_projectgroup.py'
--- lib/lp/registry/browser/tests/test_projectgroup.py 2012-08-14 13:43:24 +0000
+++ lib/lp/registry/browser/tests/test_projectgroup.py 2012-08-14 23:32:21 +0000
@@ -13,12 +13,8 @@
from zope.security.interfaces import Unauthorized
from lp.app.browser.lazrjs import vocabulary_to_choice_edit_items
-from lp.registry.enums import (
- EXCLUSIVE_TEAM_POLICY,
- )
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.enums import EXCLUSIVE_TEAM_POLICY
+from lp.registry.interfaces.person import IPersonSet
from lp.services.webapp import canonical_url
from lp.services.webapp.interfaces import ILaunchBag
from lp.testing import (
=== modified file 'lib/lp/registry/browser/tests/test_team.py'
--- lib/lp/registry/browser/tests/test_team.py 2012-08-13 21:33:47 +0000
+++ lib/lp/registry/browser/tests/test_team.py 2012-08-14 23:32:21 +0000
@@ -21,13 +21,11 @@
INCLUSIVE_TEAM_POLICY,
InformationType,
PersonVisibility,
+ TeamMembershipPolicy,
TeamMembershipRenewalPolicy,
- TeamMembershipPolicy,
)
from lp.registry.interfaces.mailinglist import MailingListStatus
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
from lp.registry.interfaces.teammembership import (
ITeamMembershipSet,
=== modified file 'lib/lp/registry/mail/notification.py'
--- lib/lp/registry/mail/notification.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/mail/notification.py 2012-08-14 23:32:21 +0000
@@ -17,13 +17,9 @@
getUtility,
)
-from lp.registry.enums import (
- TeamMembershipPolicy,
- )
+from lp.registry.enums import TeamMembershipPolicy
from lp.registry.interfaces.mailinglist import IHeldMessageDetails
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.teammembership import (
ITeamMembershipSet,
TeamMembershipStatus,
=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py 2012-08-14 15:10:06 +0000
+++ lib/lp/registry/model/person.py 2012-08-14 23:32:21 +0000
@@ -155,8 +155,8 @@
INCLUSIVE_TEAM_POLICY,
PersonVisibility,
PRIVATE_INFORMATION_TYPES,
+ TeamMembershipPolicy,
TeamMembershipRenewalPolicy,
- TeamMembershipPolicy,
)
from lp.registry.errors import (
InvalidName,
@@ -194,8 +194,8 @@
PersonalStanding,
PersonCreationRationale,
TeamEmailAddressError,
+ validate_membership_policy,
validate_public_person,
- validate_membership_policy,
)
from lp.registry.interfaces.personnotification import IPersonNotificationSet
from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
=== modified file 'lib/lp/registry/model/teammembership.py'
--- lib/lp/registry/model/teammembership.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/model/teammembership.py 2012-08-14 23:32:21 +0000
@@ -28,9 +28,7 @@
from lp.app.browser.tales import DurationFormatterAPI
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
-from lp.registry.enums import (
- TeamMembershipRenewalPolicy,
- )
+from lp.registry.enums import TeamMembershipRenewalPolicy
from lp.registry.errors import (
TeamMembershipTransitionError,
UserCannotChangeMembershipSilently,
=== modified file 'lib/lp/registry/tests/mailinglists_helper.py'
--- lib/lp/registry/tests/mailinglists_helper.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/tests/mailinglists_helper.py 2012-08-14 23:32:21 +0000
@@ -22,18 +22,14 @@
from zope.component import getUtility
+from lp.registry.enums import TeamMembershipPolicy
from lp.registry.interfaces.mailinglist import (
IMailingListSet,
IMessageApprovalSet,
MailingListStatus,
PostedMessageStatus,
)
-from lp.registry.enums import (
- TeamMembershipPolicy,
- )
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.xmlrpc.mailinglist import MailingListAPIView
from lp.services.config import config
from lp.services.database.sqlbase import flush_database_updates
=== modified file 'lib/lp/registry/tests/test_distribution.py'
--- lib/lp/registry/tests/test_distribution.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/tests/test_distribution.py 2012-08-14 23:32:21 +0000
@@ -32,8 +32,8 @@
InformationType,
)
from lp.registry.errors import (
+ InclusiveTeamLinkageError,
NoSuchDistroSeries,
- InclusiveTeamLinkageError,
)
from lp.registry.interfaces.accesspolicy import IAccessPolicySource
from lp.registry.interfaces.distribution import (
@@ -41,9 +41,7 @@
IDistributionSet,
)
from lp.registry.interfaces.oopsreferences import IHasOOPSReferences
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.series import SeriesStatus
from lp.registry.tests.test_distroseries import CurrentSourceReleasesMixin
from lp.services.propertycache import get_property_cache
=== modified file 'lib/lp/registry/tests/test_errors.py'
--- lib/lp/registry/tests/test_errors.py 2012-08-13 20:17:56 +0000
+++ lib/lp/registry/tests/test_errors.py 2012-08-14 23:32:21 +0000
@@ -19,13 +19,13 @@
CommercialSubscribersOnly,
DeleteSubscriptionError,
DistroSeriesDifferenceError,
+ InclusiveTeamLinkageError,
JoinNotAllowed,
NameAlreadyTaken,
- InclusiveTeamLinkageError,
PPACreationError,
PrivatePersonLinkageError,
+ TeamMembershipPolicyError,
TeamMembershipTransitionError,
- TeamMembershipPolicyError,
UserCannotChangeMembershipSilently,
UserCannotSubscribePerson,
)
=== modified file 'lib/lp/registry/tests/test_mlists.py'
--- lib/lp/registry/tests/test_mlists.py 2012-08-13 21:33:47 +0000
+++ lib/lp/registry/tests/test_mlists.py 2012-08-14 23:32:21 +0000
@@ -19,8 +19,8 @@
import transaction
from lp.registry.enums import (
+ PersonVisibility,
TeamMembershipPolicy,
- PersonVisibility,
)
from lp.registry.scripts.mlistimport import Importer
from lp.services.identity.interfaces.emailaddress import EmailAddressStatus
=== modified file 'lib/lp/registry/tests/test_product.py'
--- lib/lp/registry/tests/test_product.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/tests/test_product.py 2012-08-14 23:32:21 +0000
@@ -29,10 +29,10 @@
from lp.bugs.interfaces.bugsummary import IBugSummaryDimension
from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
from lp.registry.enums import (
+ BranchSharingPolicy,
+ BugSharingPolicy,
EXCLUSIVE_TEAM_POLICY,
INCLUSIVE_TEAM_POLICY,
- BranchSharingPolicy,
- BugSharingPolicy,
InformationType,
)
from lp.registry.errors import (
=== modified file 'lib/lp/registry/tests/test_team.py'
--- lib/lp/registry/tests/test_team.py 2012-08-14 15:11:37 +0000
+++ lib/lp/registry/tests/test_team.py 2012-08-14 23:32:21 +0000
@@ -16,8 +16,8 @@
InformationType,
PersonTransferJobType,
PersonVisibility,
+ TeamMembershipPolicy,
TeamMembershipRenewalPolicy,
- TeamMembershipPolicy,
)
from lp.registry.errors import (
JoinNotAllowed,
=== modified file 'lib/lp/registry/tests/test_teammembership.py'
--- lib/lp/registry/tests/test_teammembership.py 2012-08-13 21:04:17 +0000
+++ lib/lp/registry/tests/test_teammembership.py 2012-08-14 23:32:21 +0000
@@ -25,16 +25,14 @@
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
from lp.registry.enums import (
InformationType,
+ TeamMembershipPolicy,
TeamMembershipRenewalPolicy,
- TeamMembershipPolicy,
)
from lp.registry.interfaces.accesspolicy import (
IAccessArtifactGrantSource,
IAccessArtifactSource,
)
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.teammembership import (
CyclicalTeamMembershipError,
ITeamMembershipSet,
=== modified file 'lib/lp/registry/tests/test_xmlrpc.py'
--- lib/lp/registry/tests/test_xmlrpc.py 2012-08-13 21:33:47 +0000
+++ lib/lp/registry/tests/test_xmlrpc.py 2012-08-14 23:32:21 +0000
@@ -10,9 +10,7 @@
from zope.component import getUtility
from zope.security.proxy import removeSecurityProxy
-from lp.registry.enums import (
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.person import (
IPersonSet,
ISoftwareCenterAgentAPI,
=== modified file 'lib/lp/registry/xmlrpc/mailinglist.py'
--- lib/lp/registry/xmlrpc/mailinglist.py 2012-08-13 21:42:00 +0000
+++ lib/lp/registry/xmlrpc/mailinglist.py 2012-08-14 23:32:21 +0000
@@ -15,9 +15,7 @@
from zope.interface import implements
from zope.security.proxy import removeSecurityProxy
-from lp.registry.enums import(
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.mailinglist import (
IMailingListAPIView,
IMailingListSet,
=== modified file 'lib/lp/security.py'
--- lib/lp/security.py 2012-08-13 21:33:47 +0000
+++ lib/lp/security.py 2012-08-14 23:32:21 +0000
@@ -107,9 +107,7 @@
IHWSubmissionDevice,
IHWVendorID,
)
-from lp.registry.enums import (
- PersonVisibility,
- )
+from lp.registry.enums import PersonVisibility
from lp.registry.interfaces.announcement import IAnnouncement
from lp.registry.interfaces.distribution import IDistribution
from lp.registry.interfaces.distributionmirror import IDistributionMirror
=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py 2012-08-13 21:33:47 +0000
+++ lib/lp/soyuz/browser/archive.py 2012-08-14 23:32:21 +0000
@@ -82,12 +82,8 @@
)
from lp.app.widgets.textwidgets import StrippedTextWidget
from lp.buildmaster.enums import BuildStatus
-from lp.registry.enums import (
- PersonVisibility,
- )
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.enums import PersonVisibility
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.registry.interfaces.series import SeriesStatus
from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py 2012-08-14 19:37:38 +0000
+++ lib/lp/soyuz/tests/test_archive.py 2012-08-14 23:32:21 +0000
@@ -29,9 +29,7 @@
TeamMembershipPolicy,
)
from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.person import (
- IPersonSet,
- )
+from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.registry.interfaces.series import SeriesStatus
from lp.registry.interfaces.teammembership import TeamMembershipStatus
=== modified file 'lib/lp/soyuz/tests/test_person_createppa.py'
--- lib/lp/soyuz/tests/test_person_createppa.py 2012-08-13 21:33:47 +0000
+++ lib/lp/soyuz/tests/test_person_createppa.py 2012-08-14 23:32:21 +0000
@@ -8,8 +8,8 @@
from zope.security.interfaces import Unauthorized
from lp.registry.enums import (
+ PersonVisibility,
TeamMembershipPolicy,
- PersonVisibility,
)
from lp.registry.errors import PPACreationError
from lp.registry.interfaces.teammembership import TeamMembershipStatus
=== modified file 'lib/lp/testing/pages.py'
--- lib/lp/testing/pages.py 2012-08-10 18:16:36 +0000
+++ lib/lp/testing/pages.py 2012-08-14 23:32:21 +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
Follow ups
