Launchpad itself

Merge lp:~stevenk/launchpad/imports-really-this-time into lp:launchpad

  1. imports-really-this-time
  2. Merge into devel
Proposed by Steve Kowalik on 2012-06-28
Status: Merged
Approved by: William Grant on 2012-06-28
Approved revision: no longer in the source branch.
Merged at revision: 15509
Proposed branch: lp:~stevenk/launchpad/imports-really-this-time
Merge into: lp:launchpad
Diff against target: 299 lines (+27/-41)
14 files modified
lib/lp/app/widgets/tests/test_popup.py (+1/-1)
lib/lp/bugs/scripts/bugsummaryrebuild.py (+4/-5)
lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py (+1/-1)
lib/lp/bugs/tests/test_bugtracker.py (+1/-1)
lib/lp/code/model/tests/test_branchjob.py (+1/-1)
lib/lp/code/tests/test_bzr.py (+2/-4)
lib/lp/registry/model/sharingjob.py (+1/-3)
lib/lp/registry/model/teammembership.py (+1/-3)
lib/lp/registry/services/sharingservice.py (+3/-7)
lib/lp/registry/tests/test_productjob.py (+1/-1)
lib/lp/registry/tests/test_sourcepackage.py (+1/-1)
lib/lp/security.py (+7/-8)
lib/lp/services/mail/tests/test_commands.py (+2/-3)
lib/lp/soyuz/tests/test_vocabularies.py (+1/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/imports-really-this-time
Reviewer Review Type Date Requested Status
William Grant code 2012-06-28 Approve on 2012-06-28
Review via email: mp+112470@code.launchpad.net

Commit Message

Run format-imports over lib/lp.

Description of the Change

format-imports. Because we all suck.

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/widgets/tests/test_popup.py'
2--- lib/lp/app/widgets/tests/test_popup.py 2012-06-21 06:57:06 +0000
3+++ lib/lp/app/widgets/tests/test_popup.py 2012-06-28 01:29:19 +0000
4@@ -1,6 +1,5 @@
5 # Copyright 2010-2011 Canonical Ltd. This software is licensed under the
6 # GNU Affero General Public License version 3 (see the file LICENSE).
7-from lp.services.features.testing import FeatureFixture
8
9 __metaclass__ = type
10
11@@ -14,6 +13,7 @@
12 PersonPickerWidget,
13 VocabularyPickerWidget,
14 )
15+from lp.services.features.testing import FeatureFixture
16 from lp.services.webapp.servers import LaunchpadTestRequest
17 from lp.testing import TestCaseWithFactory
18 from lp.testing.layers import DatabaseFunctionalLayer
19
20=== modified file 'lib/lp/bugs/scripts/bugsummaryrebuild.py'
21--- lib/lp/bugs/scripts/bugsummaryrebuild.py 2012-06-25 11:23:12 +0000
22+++ lib/lp/bugs/scripts/bugsummaryrebuild.py 2012-06-28 01:29:19 +0000
23@@ -3,8 +3,6 @@
24
25 __metaclass__ = type
26
27-import transaction
28-
29 from storm.expr import (
30 Alias,
31 And,
32@@ -17,13 +15,14 @@
33 With,
34 )
35 from storm.properties import Bool
36+import transaction
37
38 from lp.bugs.model.bug import BugTag
39 from lp.bugs.model.bugsubscription import BugSubscription
40 from lp.bugs.model.bugsummary import BugSummary
41 from lp.bugs.model.bugtask import (
42+ bug_target_from_key,
43 bug_target_to_key,
44- bug_target_from_key,
45 BugTask,
46 )
47 from lp.bugs.model.bugtaskflat import BugTaskFlat
48@@ -34,10 +33,10 @@
49 from lp.registry.interfaces.distribution import IDistribution
50 from lp.registry.interfaces.distroseries import IDistroSeries
51 from lp.registry.interfaces.series import ISeriesMixin
52+from lp.registry.model.distribution import Distribution
53+from lp.registry.model.distroseries import DistroSeries
54 from lp.registry.model.product import Product
55 from lp.registry.model.productseries import ProductSeries
56-from lp.registry.model.distribution import Distribution
57-from lp.registry.model.distroseries import DistroSeries
58 from lp.registry.model.sourcepackagename import SourcePackageName
59 from lp.services.database.bulk import create
60 from lp.services.database.lpstorm import IStore
61
62=== modified file 'lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py'
63--- lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py 2012-06-25 11:09:15 +0000
64+++ lib/lp/bugs/scripts/tests/test_bugsummaryrebuild.py 2012-06-28 01:29:19 +0000
65@@ -21,8 +21,8 @@
66 calculate_bugsummary_rows,
67 format_target,
68 get_bugsummary_rows,
69+ get_bugsummary_targets,
70 get_bugsummaryjournal_rows,
71- get_bugsummary_targets,
72 get_bugtask_targets,
73 RawBugSummary,
74 rebuild_bugsummary_for_target,
75
76=== modified file 'lib/lp/bugs/tests/test_bugtracker.py'
77--- lib/lp/bugs/tests/test_bugtracker.py 2012-06-22 18:41:45 +0000
78+++ lib/lp/bugs/tests/test_bugtracker.py 2012-06-28 01:29:19 +0000
79@@ -44,8 +44,8 @@
80 from lp.registry.interfaces.person import IPersonSet
81 from lp.testing import (
82 login,
83+ login_celebrity,
84 login_person,
85- login_celebrity,
86 TestCase,
87 TestCaseWithFactory,
88 )
89
90=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
91--- lib/lp/code/model/tests/test_branchjob.py 2012-06-26 14:11:23 +0000
92+++ lib/lp/code/model/tests/test_branchjob.py 2012-06-28 01:29:19 +0000
93@@ -29,9 +29,9 @@
94 from zope.security.proxy import removeSecurityProxy
95
96 from lp.code.bzr import (
97+ branch_revision_history,
98 BranchFormat,
99 RepositoryFormat,
100- branch_revision_history,
101 )
102 from lp.code.enums import (
103 BranchMergeProposalStatus,
104
105=== modified file 'lib/lp/code/tests/test_bzr.py'
106--- lib/lp/code/tests/test_bzr.py 2012-06-26 14:43:55 +0000
107+++ lib/lp/code/tests/test_bzr.py 2012-06-28 01:29:19 +0000
108@@ -5,9 +5,7 @@
109
110 __metaclass__ = type
111
112-from bzrlib.errors import (
113- NoSuchRevision,
114- )
115+from bzrlib.errors import NoSuchRevision
116 from bzrlib.revision import NULL_REVISION
117 from bzrlib.tests import (
118 TestCaseInTempDir,
119@@ -15,8 +13,8 @@
120 )
121
122 from lp.code.bzr import (
123+ branch_revision_history,
124 BranchFormat,
125- branch_revision_history,
126 ControlFormat,
127 get_ancestry,
128 get_branch_formats,
129
130=== modified file 'lib/lp/registry/model/sharingjob.py'
131--- lib/lp/registry/model/sharingjob.py 2012-06-19 04:38:35 +0000
132+++ lib/lp/registry/model/sharingjob.py 2012-06-28 01:29:19 +0000
133@@ -44,9 +44,7 @@
134 from lp.bugs.interfaces.bug import IBugSet
135 from lp.bugs.model.bugsubscription import BugSubscription
136 from lp.bugs.model.bugtaskflat import BugTaskFlat
137-from lp.bugs.model.bugtasksearch import (
138- get_bug_privacy_filter_terms,
139- )
140+from lp.bugs.model.bugtasksearch import get_bug_privacy_filter_terms
141 from lp.registry.enums import InformationType
142 from lp.registry.interfaces.person import IPersonSet
143 from lp.registry.interfaces.product import IProduct
144
145=== modified file 'lib/lp/registry/model/teammembership.py'
146--- lib/lp/registry/model/teammembership.py 2012-06-15 02:26:09 +0000
147+++ lib/lp/registry/model/teammembership.py 2012-06-28 01:29:19 +0000
148@@ -42,9 +42,7 @@
149 IMembershipNotificationJobSource,
150 )
151 from lp.registry.interfaces.role import IPersonRoles
152-from lp.registry.interfaces.sharingjob import (
153- IRemoveBugSubscriptionsJobSource,
154- )
155+from lp.registry.interfaces.sharingjob import IRemoveBugSubscriptionsJobSource
156 from lp.registry.interfaces.teammembership import (
157 ACTIVE_STATES,
158 CyclicalTeamMembershipError,
159
160=== modified file 'lib/lp/registry/services/sharingservice.py'
161--- lib/lp/registry/services/sharingservice.py 2012-06-19 03:05:00 +0000
162+++ lib/lp/registry/services/sharingservice.py 2012-06-28 01:29:19 +0000
163@@ -11,9 +11,7 @@
164 from itertools import product
165
166 from lazr.restful.interfaces import IWebBrowserOriginatingRequest
167-from lazr.restful.utils import (
168- get_current_web_service_request,
169- )
170+from lazr.restful.utils import get_current_web_service_request
171 from storm.expr import (
172 And,
173 In,
174@@ -46,14 +44,12 @@
175 from lp.registry.interfaces.person import IPersonSet
176 from lp.registry.interfaces.product import IProduct
177 from lp.registry.interfaces.projectgroup import IProjectGroup
178-from lp.registry.interfaces.sharingjob import (
179- IRemoveBugSubscriptionsJobSource,
180- )
181+from lp.registry.interfaces.sharingjob import IRemoveBugSubscriptionsJobSource
182 from lp.registry.interfaces.sharingservice import ISharingService
183 from lp.registry.model.accesspolicy import (
184 AccessArtifactGrant,
185+ AccessPolicyArtifact,
186 AccessPolicyGrant,
187- AccessPolicyArtifact,
188 )
189 from lp.registry.model.person import Person
190 from lp.registry.model.teammembership import TeamParticipation
191
192=== modified file 'lib/lp/registry/tests/test_productjob.py'
193--- lib/lp/registry/tests/test_productjob.py 2012-06-18 20:54:11 +0000
194+++ lib/lp/registry/tests/test_productjob.py 2012-06-28 01:29:19 +0000
195@@ -11,9 +11,9 @@
196 )
197
198 import pytz
199-import transaction
200 from testtools.content import Content
201 from testtools.content_type import UTF8_TEXT
202+import transaction
203 from zope.component import getUtility
204 from zope.interface import (
205 classProvides,
206
207=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
208--- lib/lp/registry/tests/test_sourcepackage.py 2012-06-21 15:11:30 +0000
209+++ lib/lp/registry/tests/test_sourcepackage.py 2012-06-28 01:29:19 +0000
210@@ -12,11 +12,11 @@
211 from storm.locals import Store
212 import transaction
213 from zope.component import getUtility
214+from zope.interface.verify import verifyObject
215 from zope.security.checker import canAccess
216 from zope.security.interfaces import Unauthorized
217 from zope.security.management import checkPermission
218 from zope.security.proxy import removeSecurityProxy
219-from zope.interface.verify import verifyObject
220
221 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
222 from lp.code.model.seriessourcepackagebranch import (
223
224=== modified file 'lib/lp/security.py'
225--- lib/lp/security.py 2012-06-15 00:39:13 +0000
226+++ lib/lp/security.py 2012-06-28 01:29:19 +0000
227@@ -11,21 +11,20 @@
228 'ModerateByRegistryExpertsOrAdmins',
229 ]
230
231-from zope.component import (
232- getUtility,
233- queryAdapter,
234- )
235-from zope.interface import Interface
236-
237 from storm.expr import (
238+ And,
239 Exists,
240- And,
241 Or,
242 Select,
243 SQL,
244 Union,
245 With,
246 )
247+from zope.component import (
248+ getUtility,
249+ queryAdapter,
250+ )
251+from zope.interface import Interface
252
253 from lp.answers.interfaces.faq import IFAQ
254 from lp.answers.interfaces.faqtarget import IFAQTarget
255@@ -57,8 +56,8 @@
256 from lp.bugs.interfaces.bugtarget import IOfficialBugTagTargetRestricted
257 from lp.bugs.interfaces.structuralsubscription import IStructuralSubscription
258 from lp.bugs.model.bugsubscription import BugSubscription
259+from lp.bugs.model.bugtaskflat import BugTaskFlat
260 from lp.bugs.model.bugtasksearch import get_bug_privacy_filter
261-from lp.bugs.model.bugtaskflat import BugTaskFlat
262 from lp.buildmaster.interfaces.builder import (
263 IBuilder,
264 IBuilderSet,
265
266=== modified file 'lib/lp/services/mail/tests/test_commands.py'
267--- lib/lp/services/mail/tests/test_commands.py 2012-06-20 11:57:08 +0000
268+++ lib/lp/services/mail/tests/test_commands.py 2012-06-28 01:29:19 +0000
269@@ -4,12 +4,11 @@
270 from doctest import DocTestSuite
271 import unittest
272
273-from lp.testing import TestCase
274-
275-from lp.services.mail.commands import(
276+from lp.services.mail.commands import (
277 EmailCommand,
278 EmailCommandCollection,
279 )
280+from lp.testing import TestCase
281
282
283 class CommandOne(EmailCommand):
284
285=== modified file 'lib/lp/soyuz/tests/test_vocabularies.py'
286--- lib/lp/soyuz/tests/test_vocabularies.py 2012-06-19 23:01:58 +0000
287+++ lib/lp/soyuz/tests/test_vocabularies.py 2012-06-28 01:29:19 +0000
288@@ -5,10 +5,9 @@
289
290 __metaclass__ = type
291
292+from testtools.matchers import MatchesStructure
293 from zope.schema.vocabulary import SimpleTerm
294
295-from testtools.matchers import MatchesStructure
296-
297 from lp.soyuz.vocabularies import PPAVocabulary
298 from lp.testing import TestCaseWithFactory
299 from lp.testing.layers import DatabaseFunctionalLayer