Launchpad itself

Merge lp:~stevenk/launchpad/format-imports-and-again into lp:launchpad

  1. format-imports-and-again
  2. Merge into devel
Proposed by Steve Kowalik on 2012-08-14
Status: Merged
Approved by: Steve Kowalik on 2012-08-14
Approved revision: no longer in the source branch.
Merged at revision: 15809
Proposed branch: lp:~stevenk/launchpad/format-imports-and-again
Merge into: lp:launchpad
Diff against target: 630 lines (+52/-123)
36 files modified
lib/lp/app/browser/root.py (+1/-1)
lib/lp/app/browser/tests/test_launchpad.py (+1/-3)
lib/lp/app/tests/test_security.py (+2/-6)
lib/lp/bugs/browser/tests/test_bugsubscription_views.py (+1/-3)
lib/lp/bugs/browser/tests/test_bugsupervisor.py (+2/-6)
lib/lp/bugs/externalbugtracker/tests/test_debbugs.py (+1/-4)
lib/lp/bugs/model/tests/test_bugtask.py (+1/-3)
lib/lp/bugs/subscribers/bugactivity.py (+2/-6)
lib/lp/code/browser/tests/test_branchlisting.py (+1/-3)
lib/lp/code/browser/tests/test_branchmergeproposal.py (+1/-1)
lib/lp/code/model/tests/test_branchmergeproposal.py (+1/-3)
lib/lp/codehosting/tests/servers.py (+2/-6)
lib/lp/registry/browser/person.py (+1/-3)
lib/lp/registry/browser/pillar.py (+1/-3)
lib/lp/registry/browser/team.py (+2/-2)
lib/lp/registry/browser/tests/test_peoplemerge.py (+1/-3)
lib/lp/registry/browser/tests/test_person.py (+2/-6)
lib/lp/registry/browser/tests/test_projectgroup.py (+2/-6)
lib/lp/registry/browser/tests/test_team.py (+2/-4)
lib/lp/registry/mail/notification.py (+2/-6)
lib/lp/registry/model/person.py (+2/-2)
lib/lp/registry/model/teammembership.py (+1/-3)
lib/lp/registry/tests/mailinglists_helper.py (+2/-6)
lib/lp/registry/tests/test_distribution.py (+2/-4)
lib/lp/registry/tests/test_errors.py (+2/-2)
lib/lp/registry/tests/test_mlists.py (+1/-1)
lib/lp/registry/tests/test_product.py (+2/-2)
lib/lp/registry/tests/test_team.py (+1/-1)
lib/lp/registry/tests/test_teammembership.py (+2/-4)
lib/lp/registry/tests/test_xmlrpc.py (+1/-3)
lib/lp/registry/xmlrpc/mailinglist.py (+1/-3)
lib/lp/security.py (+1/-3)
lib/lp/soyuz/browser/archive.py (+2/-6)
lib/lp/soyuz/tests/test_archive.py (+1/-3)
lib/lp/soyuz/tests/test_person_createppa.py (+1/-1)
lib/lp/testing/pages.py (+1/-1)
To merge this branch: bzr merge lp:~stevenk/launchpad/format-imports-and-again
Reviewer Review Type Date Requested Status
William Grant code 2012-08-14 Approve on 2012-08-14
Review via email: mp+119645@code.launchpad.net

Commit Message

Run format-imports lib/lp over the tree again.

Description of the Change

Run format-imports lib/lp over the tree again. Reap the LoC savings for my very own.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/app/browser/root.py'
2--- lib/lp/app/browser/root.py 2012-08-14 09:04:45 +0000
3+++ lib/lp/app/browser/root.py 2012-08-14 23:32:21 +0000
4@@ -39,11 +39,11 @@
5 from lp.registry.interfaces.pillar import IPillarNameSet
6 from lp.registry.interfaces.product import IProductSet
7 from lp.services.config import config
8+from lp.services.features import getFeatureFlag
9 from lp.services.googlesearch.interfaces import (
10 GoogleResponseError,
11 ISearchService,
12 )
13-from lp.services.features import getFeatureFlag
14 from lp.services.propertycache import cachedproperty
15 from lp.services.statistics.interfaces.statistic import ILaunchpadStatisticSet
16 from lp.services.timeout import urlfetch
17
18=== modified file 'lib/lp/app/browser/tests/test_launchpad.py'
19--- lib/lp/app/browser/tests/test_launchpad.py 2012-08-13 21:33:47 +0000
20+++ lib/lp/app/browser/tests/test_launchpad.py 2012-08-14 23:32:21 +0000
21@@ -24,9 +24,7 @@
22 InformationType,
23 PersonVisibility,
24 )
25-from lp.registry.interfaces.person import (
26- IPersonSet,
27- )
28+from lp.registry.interfaces.person import IPersonSet
29 from lp.services.identity.interfaces.account import AccountStatus
30 from lp.services.webapp import canonical_url
31 from lp.services.webapp.interfaces import (
32
33=== modified file 'lib/lp/app/tests/test_security.py'
34--- lib/lp/app/tests/test_security.py 2012-08-13 21:33:47 +0000
35+++ lib/lp/app/tests/test_security.py 2012-08-14 23:32:21 +0000
36@@ -17,12 +17,8 @@
37 AuthorizationBase,
38 DelegatedAuthorization,
39 )
40-from lp.registry.enums import (
41- PersonVisibility,
42- )
43-from lp.registry.interfaces.person import (
44- IPerson,
45- )
46+from lp.registry.enums import PersonVisibility
47+from lp.registry.interfaces.person import IPerson
48 from lp.registry.interfaces.role import IPersonRoles
49 from lp.registry.interfaces.teammembership import (
50 ITeamMembershipSet,
51
52=== modified file 'lib/lp/bugs/browser/tests/test_bugsubscription_views.py'
53--- lib/lp/bugs/browser/tests/test_bugsubscription_views.py 2012-08-13 21:33:47 +0000
54+++ lib/lp/bugs/browser/tests/test_bugsubscription_views.py 2012-08-14 23:32:21 +0000
55@@ -24,9 +24,7 @@
56 PersonVisibility,
57 TeamMembershipPolicy,
58 )
59-from lp.registry.interfaces.person import (
60- IPersonSet,
61- )
62+from lp.registry.interfaces.person import IPersonSet
63 from lp.services.webapp import canonical_url
64 from lp.services.webapp.servers import LaunchpadTestRequest
65 from lp.testing import (
66
67=== modified file 'lib/lp/bugs/browser/tests/test_bugsupervisor.py'
68--- lib/lp/bugs/browser/tests/test_bugsupervisor.py 2012-08-13 21:33:47 +0000
69+++ lib/lp/bugs/browser/tests/test_bugsupervisor.py 2012-08-14 23:32:21 +0000
70@@ -9,12 +9,8 @@
71 from zope.component import getUtility
72
73 from lp.bugs.browser.bugsupervisor import BugSupervisorEditSchema
74-from lp.registry.enums import (
75- PersonVisibility,
76- )
77-from lp.registry.interfaces.person import (
78- IPersonSet,
79- )
80+from lp.registry.enums import PersonVisibility
81+from lp.registry.interfaces.person import IPersonSet
82 from lp.services.webapp.publisher import canonical_url
83 from lp.testing import (
84 BrowserTestCase,
85
86=== modified file 'lib/lp/bugs/externalbugtracker/tests/test_debbugs.py'
87--- lib/lp/bugs/externalbugtracker/tests/test_debbugs.py 2012-08-09 16:14:41 +0000
88+++ lib/lp/bugs/externalbugtracker/tests/test_debbugs.py 2012-08-14 23:32:21 +0000
89@@ -25,10 +25,7 @@
90 SummaryParseError,
91 SummaryVersionError,
92 )
93-
94-from lp.testing import (
95- TestCase,
96- )
97+from lp.testing import TestCase
98
99
100 class TestDebBugs(TestCase):
101
102=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
103--- lib/lp/bugs/model/tests/test_bugtask.py 2012-08-13 21:04:17 +0000
104+++ lib/lp/bugs/model/tests/test_bugtask.py 2012-08-14 23:32:21 +0000
105@@ -70,9 +70,7 @@
106 IDistributionSourcePackage,
107 )
108 from lp.registry.interfaces.distroseries import IDistroSeriesSet
109-from lp.registry.interfaces.person import (
110- IPersonSet,
111- )
112+from lp.registry.interfaces.person import IPersonSet
113 from lp.registry.interfaces.product import IProductSet
114 from lp.registry.interfaces.projectgroup import IProjectGroupSet
115 from lp.registry.interfaces.sourcepackage import ISourcePackage
116
117=== modified file 'lib/lp/bugs/subscribers/bugactivity.py'
118--- lib/lp/bugs/subscribers/bugactivity.py 2012-08-13 21:33:47 +0000
119+++ lib/lp/bugs/subscribers/bugactivity.py 2012-08-14 23:32:21 +0000
120@@ -20,13 +20,9 @@
121 )
122 from lp.bugs.interfaces.bug import IBug
123 from lp.bugs.interfaces.bugactivity import IBugActivitySet
124-from lp.registry.enums import (
125- PersonVisibility,
126- )
127+from lp.registry.enums import PersonVisibility
128 from lp.registry.interfaces.milestone import IMilestone
129-from lp.registry.interfaces.person import (
130- IPerson,
131- )
132+from lp.registry.interfaces.person import IPerson
133 from lp.registry.interfaces.productrelease import IProductRelease
134 from lp.services.database.constants import UTC_NOW
135 from lp.services.database.sqlbase import block_implicit_flushes
136
137=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
138--- lib/lp/code/browser/tests/test_branchlisting.py 2012-08-13 21:33:47 +0000
139+++ lib/lp/code/browser/tests/test_branchlisting.py 2012-08-14 23:32:21 +0000
140@@ -32,9 +32,7 @@
141 from lp.code.model.seriessourcepackagebranch import (
142 SeriesSourcePackageBranchSet,
143 )
144-from lp.registry.enums import (
145- PersonVisibility,
146- )
147+from lp.registry.enums import PersonVisibility
148 from lp.registry.interfaces.person import (
149 IPerson,
150 IPersonSet,
151
152=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
153--- lib/lp/code/browser/tests/test_branchmergeproposal.py 2012-08-13 21:33:47 +0000
154+++ lib/lp/code/browser/tests/test_branchmergeproposal.py 2012-08-14 23:32:21 +0000
155@@ -55,8 +55,8 @@
156 )
157 from lp.registry.enums import (
158 InformationType,
159+ PersonVisibility,
160 TeamMembershipPolicy,
161- PersonVisibility,
162 )
163 from lp.services.messages.model.message import MessageSet
164 from lp.services.webapp import canonical_url
165
166=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
167--- lib/lp/code/model/tests/test_branchmergeproposal.py 2012-08-13 21:04:17 +0000
168+++ lib/lp/code/model/tests/test_branchmergeproposal.py 2012-08-14 23:32:21 +0000
169@@ -66,9 +66,7 @@
170 InformationType,
171 TeamMembershipPolicy,
172 )
173-from lp.registry.interfaces.person import (
174- IPersonSet,
175- )
176+from lp.registry.interfaces.person import IPersonSet
177 from lp.registry.interfaces.product import IProductSet
178 from lp.services.database.constants import UTC_NOW
179 from lp.services.webapp import canonical_url
180
181=== modified file 'lib/lp/codehosting/tests/servers.py'
182--- lib/lp/codehosting/tests/servers.py 2012-08-13 21:04:17 +0000
183+++ lib/lp/codehosting/tests/servers.py 2012-08-14 23:32:21 +0000
184@@ -23,12 +23,8 @@
185 from twisted.python.util import sibpath
186 from zope.component import getUtility
187
188-from lp.registry.enums import (
189- TeamMembershipPolicy,
190- )
191-from lp.registry.interfaces.person import (
192- IPersonSet,
193- )
194+from lp.registry.enums import TeamMembershipPolicy
195+from lp.registry.interfaces.person import IPersonSet
196 from lp.registry.interfaces.ssh import ISSHKeySet
197 from lp.services.config import config
198 from lp.services.daemons.tachandler import TacTestSetup
199
200=== modified file 'lib/lp/registry/browser/person.py'
201--- lib/lp/registry/browser/person.py 2012-08-13 21:33:47 +0000
202+++ lib/lp/registry/browser/person.py 2012-08-14 23:32:21 +0000
203@@ -160,9 +160,7 @@
204 TopLevelMenuMixin,
205 )
206 from lp.registry.browser.teamjoin import TeamJoinMixin
207-from lp.registry.enums import (
208- PersonVisibility,
209- )
210+from lp.registry.enums import PersonVisibility
211 from lp.registry.interfaces.codeofconduct import ISignedCodeOfConductSet
212 from lp.registry.interfaces.gpg import IGPGKeySet
213 from lp.registry.interfaces.irc import IIrcIDSet
214
215=== modified file 'lib/lp/registry/browser/pillar.py'
216--- lib/lp/registry/browser/pillar.py 2012-08-13 21:04:17 +0000
217+++ lib/lp/registry/browser/pillar.py 2012-08-14 23:32:21 +0000
218@@ -55,9 +55,7 @@
219 IDistributionSourcePackage,
220 )
221 from lp.registry.interfaces.distroseries import IDistroSeries
222-from lp.registry.interfaces.person import (
223- IPersonSet,
224- )
225+from lp.registry.interfaces.person import IPersonSet
226 from lp.registry.interfaces.pillar import IPillar
227 from lp.registry.interfaces.projectgroup import IProjectGroup
228 from lp.registry.model.pillar import PillarPerson
229
230=== modified file 'lib/lp/registry/browser/team.py'
231--- lib/lp/registry/browser/team.py 2012-08-14 13:53:51 +0000
232+++ lib/lp/registry/browser/team.py 2012-08-14 23:32:21 +0000
233@@ -47,8 +47,8 @@
234 import simplejson
235 from z3c.ptcompat import ViewPageTemplateFile
236 from zope.app.form.browser import TextAreaWidget
237+from zope.app.form.browser.textwidgets import IntWidget
238 from zope.component import getUtility
239-from zope.app.form.browser.textwidgets import IntWidget
240 from zope.formlib.form import (
241 Fields,
242 FormField,
243@@ -113,8 +113,8 @@
244 EXCLUSIVE_TEAM_POLICY,
245 INCLUSIVE_TEAM_POLICY,
246 PersonVisibility,
247+ TeamMembershipPolicy,
248 TeamMembershipRenewalPolicy,
249- TeamMembershipPolicy,
250 )
251 from lp.registry.errors import TeamMembershipPolicyError
252 from lp.registry.interfaces.mailinglist import (
253
254=== modified file 'lib/lp/registry/browser/tests/test_peoplemerge.py'
255--- lib/lp/registry/browser/tests/test_peoplemerge.py 2012-08-13 21:04:17 +0000
256+++ lib/lp/registry/browser/tests/test_peoplemerge.py 2012-08-14 23:32:21 +0000
257@@ -10,9 +10,7 @@
258 InformationType,
259 TeamMembershipPolicy,
260 )
261-from lp.registry.interfaces.person import (
262- IPersonSet,
263- )
264+from lp.registry.interfaces.person import IPersonSet
265 from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
266 from lp.testing import (
267 login_celebrity,
268
269=== modified file 'lib/lp/registry/browser/tests/test_person.py'
270--- lib/lp/registry/browser/tests/test_person.py 2012-08-13 21:33:47 +0000
271+++ lib/lp/registry/browser/tests/test_person.py 2012-08-14 23:32:21 +0000
272@@ -24,13 +24,9 @@
273 from lp.buildmaster.enums import BuildStatus
274 from lp.registry.browser.person import PersonView
275 from lp.registry.browser.team import TeamInvitationView
276-from lp.registry.enums import (
277- PersonVisibility,
278- )
279+from lp.registry.enums import PersonVisibility
280 from lp.registry.interfaces.karma import IKarmaCacheManager
281-from lp.registry.interfaces.person import (
282- IPersonSet,
283- )
284+from lp.registry.interfaces.person import IPersonSet
285 from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
286 from lp.registry.interfaces.pocket import PackagePublishingPocket
287 from lp.registry.interfaces.teammembership import (
288
289=== modified file 'lib/lp/registry/browser/tests/test_projectgroup.py'
290--- lib/lp/registry/browser/tests/test_projectgroup.py 2012-08-14 13:43:24 +0000
291+++ lib/lp/registry/browser/tests/test_projectgroup.py 2012-08-14 23:32:21 +0000
292@@ -13,12 +13,8 @@
293 from zope.security.interfaces import Unauthorized
294
295 from lp.app.browser.lazrjs import vocabulary_to_choice_edit_items
296-from lp.registry.enums import (
297- EXCLUSIVE_TEAM_POLICY,
298- )
299-from lp.registry.interfaces.person import (
300- IPersonSet,
301- )
302+from lp.registry.enums import EXCLUSIVE_TEAM_POLICY
303+from lp.registry.interfaces.person import IPersonSet
304 from lp.services.webapp import canonical_url
305 from lp.services.webapp.interfaces import ILaunchBag
306 from lp.testing import (
307
308=== modified file 'lib/lp/registry/browser/tests/test_team.py'
309--- lib/lp/registry/browser/tests/test_team.py 2012-08-13 21:33:47 +0000
310+++ lib/lp/registry/browser/tests/test_team.py 2012-08-14 23:32:21 +0000
311@@ -21,13 +21,11 @@
312 INCLUSIVE_TEAM_POLICY,
313 InformationType,
314 PersonVisibility,
315+ TeamMembershipPolicy,
316 TeamMembershipRenewalPolicy,
317- TeamMembershipPolicy,
318 )
319 from lp.registry.interfaces.mailinglist import MailingListStatus
320-from lp.registry.interfaces.person import (
321- IPersonSet,
322- )
323+from lp.registry.interfaces.person import IPersonSet
324 from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
325 from lp.registry.interfaces.teammembership import (
326 ITeamMembershipSet,
327
328=== modified file 'lib/lp/registry/mail/notification.py'
329--- lib/lp/registry/mail/notification.py 2012-08-13 21:04:17 +0000
330+++ lib/lp/registry/mail/notification.py 2012-08-14 23:32:21 +0000
331@@ -17,13 +17,9 @@
332 getUtility,
333 )
334
335-from lp.registry.enums import (
336- TeamMembershipPolicy,
337- )
338+from lp.registry.enums import TeamMembershipPolicy
339 from lp.registry.interfaces.mailinglist import IHeldMessageDetails
340-from lp.registry.interfaces.person import (
341- IPersonSet,
342- )
343+from lp.registry.interfaces.person import IPersonSet
344 from lp.registry.interfaces.teammembership import (
345 ITeamMembershipSet,
346 TeamMembershipStatus,
347
348=== modified file 'lib/lp/registry/model/person.py'
349--- lib/lp/registry/model/person.py 2012-08-14 15:10:06 +0000
350+++ lib/lp/registry/model/person.py 2012-08-14 23:32:21 +0000
351@@ -155,8 +155,8 @@
352 INCLUSIVE_TEAM_POLICY,
353 PersonVisibility,
354 PRIVATE_INFORMATION_TYPES,
355+ TeamMembershipPolicy,
356 TeamMembershipRenewalPolicy,
357- TeamMembershipPolicy,
358 )
359 from lp.registry.errors import (
360 InvalidName,
361@@ -194,8 +194,8 @@
362 PersonalStanding,
363 PersonCreationRationale,
364 TeamEmailAddressError,
365+ validate_membership_policy,
366 validate_public_person,
367- validate_membership_policy,
368 )
369 from lp.registry.interfaces.personnotification import IPersonNotificationSet
370 from lp.registry.interfaces.persontransferjob import IPersonMergeJobSource
371
372=== modified file 'lib/lp/registry/model/teammembership.py'
373--- lib/lp/registry/model/teammembership.py 2012-08-13 21:04:17 +0000
374+++ lib/lp/registry/model/teammembership.py 2012-08-14 23:32:21 +0000
375@@ -28,9 +28,7 @@
376
377 from lp.app.browser.tales import DurationFormatterAPI
378 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
379-from lp.registry.enums import (
380- TeamMembershipRenewalPolicy,
381- )
382+from lp.registry.enums import TeamMembershipRenewalPolicy
383 from lp.registry.errors import (
384 TeamMembershipTransitionError,
385 UserCannotChangeMembershipSilently,
386
387=== modified file 'lib/lp/registry/tests/mailinglists_helper.py'
388--- lib/lp/registry/tests/mailinglists_helper.py 2012-08-13 21:04:17 +0000
389+++ lib/lp/registry/tests/mailinglists_helper.py 2012-08-14 23:32:21 +0000
390@@ -22,18 +22,14 @@
391
392 from zope.component import getUtility
393
394+from lp.registry.enums import TeamMembershipPolicy
395 from lp.registry.interfaces.mailinglist import (
396 IMailingListSet,
397 IMessageApprovalSet,
398 MailingListStatus,
399 PostedMessageStatus,
400 )
401-from lp.registry.enums import (
402- TeamMembershipPolicy,
403- )
404-from lp.registry.interfaces.person import (
405- IPersonSet,
406- )
407+from lp.registry.interfaces.person import IPersonSet
408 from lp.registry.xmlrpc.mailinglist import MailingListAPIView
409 from lp.services.config import config
410 from lp.services.database.sqlbase import flush_database_updates
411
412=== modified file 'lib/lp/registry/tests/test_distribution.py'
413--- lib/lp/registry/tests/test_distribution.py 2012-08-13 21:04:17 +0000
414+++ lib/lp/registry/tests/test_distribution.py 2012-08-14 23:32:21 +0000
415@@ -32,8 +32,8 @@
416 InformationType,
417 )
418 from lp.registry.errors import (
419+ InclusiveTeamLinkageError,
420 NoSuchDistroSeries,
421- InclusiveTeamLinkageError,
422 )
423 from lp.registry.interfaces.accesspolicy import IAccessPolicySource
424 from lp.registry.interfaces.distribution import (
425@@ -41,9 +41,7 @@
426 IDistributionSet,
427 )
428 from lp.registry.interfaces.oopsreferences import IHasOOPSReferences
429-from lp.registry.interfaces.person import (
430- IPersonSet,
431- )
432+from lp.registry.interfaces.person import IPersonSet
433 from lp.registry.interfaces.series import SeriesStatus
434 from lp.registry.tests.test_distroseries import CurrentSourceReleasesMixin
435 from lp.services.propertycache import get_property_cache
436
437=== modified file 'lib/lp/registry/tests/test_errors.py'
438--- lib/lp/registry/tests/test_errors.py 2012-08-13 20:17:56 +0000
439+++ lib/lp/registry/tests/test_errors.py 2012-08-14 23:32:21 +0000
440@@ -19,13 +19,13 @@
441 CommercialSubscribersOnly,
442 DeleteSubscriptionError,
443 DistroSeriesDifferenceError,
444+ InclusiveTeamLinkageError,
445 JoinNotAllowed,
446 NameAlreadyTaken,
447- InclusiveTeamLinkageError,
448 PPACreationError,
449 PrivatePersonLinkageError,
450+ TeamMembershipPolicyError,
451 TeamMembershipTransitionError,
452- TeamMembershipPolicyError,
453 UserCannotChangeMembershipSilently,
454 UserCannotSubscribePerson,
455 )
456
457=== modified file 'lib/lp/registry/tests/test_mlists.py'
458--- lib/lp/registry/tests/test_mlists.py 2012-08-13 21:33:47 +0000
459+++ lib/lp/registry/tests/test_mlists.py 2012-08-14 23:32:21 +0000
460@@ -19,8 +19,8 @@
461 import transaction
462
463 from lp.registry.enums import (
464+ PersonVisibility,
465 TeamMembershipPolicy,
466- PersonVisibility,
467 )
468 from lp.registry.scripts.mlistimport import Importer
469 from lp.services.identity.interfaces.emailaddress import EmailAddressStatus
470
471=== modified file 'lib/lp/registry/tests/test_product.py'
472--- lib/lp/registry/tests/test_product.py 2012-08-13 21:04:17 +0000
473+++ lib/lp/registry/tests/test_product.py 2012-08-14 23:32:21 +0000
474@@ -29,10 +29,10 @@
475 from lp.bugs.interfaces.bugsummary import IBugSummaryDimension
476 from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
477 from lp.registry.enums import (
478+ BranchSharingPolicy,
479+ BugSharingPolicy,
480 EXCLUSIVE_TEAM_POLICY,
481 INCLUSIVE_TEAM_POLICY,
482- BranchSharingPolicy,
483- BugSharingPolicy,
484 InformationType,
485 )
486 from lp.registry.errors import (
487
488=== modified file 'lib/lp/registry/tests/test_team.py'
489--- lib/lp/registry/tests/test_team.py 2012-08-14 15:11:37 +0000
490+++ lib/lp/registry/tests/test_team.py 2012-08-14 23:32:21 +0000
491@@ -16,8 +16,8 @@
492 InformationType,
493 PersonTransferJobType,
494 PersonVisibility,
495+ TeamMembershipPolicy,
496 TeamMembershipRenewalPolicy,
497- TeamMembershipPolicy,
498 )
499 from lp.registry.errors import (
500 JoinNotAllowed,
501
502=== modified file 'lib/lp/registry/tests/test_teammembership.py'
503--- lib/lp/registry/tests/test_teammembership.py 2012-08-13 21:04:17 +0000
504+++ lib/lp/registry/tests/test_teammembership.py 2012-08-14 23:32:21 +0000
505@@ -25,16 +25,14 @@
506 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
507 from lp.registry.enums import (
508 InformationType,
509+ TeamMembershipPolicy,
510 TeamMembershipRenewalPolicy,
511- TeamMembershipPolicy,
512 )
513 from lp.registry.interfaces.accesspolicy import (
514 IAccessArtifactGrantSource,
515 IAccessArtifactSource,
516 )
517-from lp.registry.interfaces.person import (
518- IPersonSet,
519- )
520+from lp.registry.interfaces.person import IPersonSet
521 from lp.registry.interfaces.teammembership import (
522 CyclicalTeamMembershipError,
523 ITeamMembershipSet,
524
525=== modified file 'lib/lp/registry/tests/test_xmlrpc.py'
526--- lib/lp/registry/tests/test_xmlrpc.py 2012-08-13 21:33:47 +0000
527+++ lib/lp/registry/tests/test_xmlrpc.py 2012-08-14 23:32:21 +0000
528@@ -10,9 +10,7 @@
529 from zope.component import getUtility
530 from zope.security.proxy import removeSecurityProxy
531
532-from lp.registry.enums import (
533- PersonVisibility,
534- )
535+from lp.registry.enums import PersonVisibility
536 from lp.registry.interfaces.person import (
537 IPersonSet,
538 ISoftwareCenterAgentAPI,
539
540=== modified file 'lib/lp/registry/xmlrpc/mailinglist.py'
541--- lib/lp/registry/xmlrpc/mailinglist.py 2012-08-13 21:42:00 +0000
542+++ lib/lp/registry/xmlrpc/mailinglist.py 2012-08-14 23:32:21 +0000
543@@ -15,9 +15,7 @@
544 from zope.interface import implements
545 from zope.security.proxy import removeSecurityProxy
546
547-from lp.registry.enums import(
548- PersonVisibility,
549- )
550+from lp.registry.enums import PersonVisibility
551 from lp.registry.interfaces.mailinglist import (
552 IMailingListAPIView,
553 IMailingListSet,
554
555=== modified file 'lib/lp/security.py'
556--- lib/lp/security.py 2012-08-13 21:33:47 +0000
557+++ lib/lp/security.py 2012-08-14 23:32:21 +0000
558@@ -107,9 +107,7 @@
559 IHWSubmissionDevice,
560 IHWVendorID,
561 )
562-from lp.registry.enums import (
563- PersonVisibility,
564- )
565+from lp.registry.enums import PersonVisibility
566 from lp.registry.interfaces.announcement import IAnnouncement
567 from lp.registry.interfaces.distribution import IDistribution
568 from lp.registry.interfaces.distributionmirror import IDistributionMirror
569
570=== modified file 'lib/lp/soyuz/browser/archive.py'
571--- lib/lp/soyuz/browser/archive.py 2012-08-13 21:33:47 +0000
572+++ lib/lp/soyuz/browser/archive.py 2012-08-14 23:32:21 +0000
573@@ -82,12 +82,8 @@
574 )
575 from lp.app.widgets.textwidgets import StrippedTextWidget
576 from lp.buildmaster.enums import BuildStatus
577-from lp.registry.enums import (
578- PersonVisibility,
579- )
580-from lp.registry.interfaces.person import (
581- IPersonSet,
582- )
583+from lp.registry.enums import PersonVisibility
584+from lp.registry.interfaces.person import IPersonSet
585 from lp.registry.interfaces.pocket import PackagePublishingPocket
586 from lp.registry.interfaces.series import SeriesStatus
587 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
588
589=== modified file 'lib/lp/soyuz/tests/test_archive.py'
590--- lib/lp/soyuz/tests/test_archive.py 2012-08-14 19:37:38 +0000
591+++ lib/lp/soyuz/tests/test_archive.py 2012-08-14 23:32:21 +0000
592@@ -29,9 +29,7 @@
593 TeamMembershipPolicy,
594 )
595 from lp.registry.interfaces.distribution import IDistributionSet
596-from lp.registry.interfaces.person import (
597- IPersonSet,
598- )
599+from lp.registry.interfaces.person import IPersonSet
600 from lp.registry.interfaces.pocket import PackagePublishingPocket
601 from lp.registry.interfaces.series import SeriesStatus
602 from lp.registry.interfaces.teammembership import TeamMembershipStatus
603
604=== modified file 'lib/lp/soyuz/tests/test_person_createppa.py'
605--- lib/lp/soyuz/tests/test_person_createppa.py 2012-08-13 21:33:47 +0000
606+++ lib/lp/soyuz/tests/test_person_createppa.py 2012-08-14 23:32:21 +0000
607@@ -8,8 +8,8 @@
608 from zope.security.interfaces import Unauthorized
609
610 from lp.registry.enums import (
611+ PersonVisibility,
612 TeamMembershipPolicy,
613- PersonVisibility,
614 )
615 from lp.registry.errors import PPACreationError
616 from lp.registry.interfaces.teammembership import TeamMembershipStatus
617
618=== modified file 'lib/lp/testing/pages.py'
619--- lib/lp/testing/pages.py 2012-08-10 18:16:36 +0000
620+++ lib/lp/testing/pages.py 2012-08-14 23:32:21 +0000
621@@ -38,8 +38,8 @@
622 SimpleCookie,
623 )
624 from zope.component import getUtility
625+from zope.security.proxy import removeSecurityProxy
626 from zope.session.interfaces import ISession
627-from zope.security.proxy import removeSecurityProxy
628 from zope.testbrowser.testing import Browser
629
630 from lp.app.interfaces.launchpad import ILaunchpadCelebrities