Launchpad itself

Merge lp:~stevenk/launchpad/format-imports-ad-infinitum into lp:launchpad

  1. format-imports-ad-infinitum
  2. Merge into devel
Proposed by Steve Kowalik on 2012-09-06
Status: Merged
Approved by: William Grant on 2012-09-06
Approved revision: no longer in the source branch.
Merged at revision: 15914
Proposed branch: lp:~stevenk/launchpad/format-imports-ad-infinitum
Merge into: lp:launchpad
Diff against target: 242 lines (+22/-30)
15 files modified
lib/lp/blueprints/browser/tests/test_specification.py (+1/-1)
lib/lp/blueprints/tests/test_specification.py (+2/-2)
lib/lp/bugs/browser/tests/test_bug_views.py (+1/-1)
lib/lp/code/browser/tests/test_branch.py (+1/-3)
lib/lp/code/browser/tests/test_branchlisting.py (+1/-3)
lib/lp/code/model/branchnamespace.py (+1/-1)
lib/lp/code/model/tests/test_branchcollection.py (+4/-1)
lib/lp/code/model/tests/test_branchnamespace.py (+1/-3)
lib/lp/codehosting/__init__.py (+2/-3)
lib/lp/codehosting/tests/test_safe_open.py (+1/-3)
lib/lp/codehosting/tests/test_upgrade.py (+1/-1)
lib/lp/registry/browser/person.py (+1/-3)
lib/lp/registry/browser/tests/test_person.py (+1/-3)
lib/lp/registry/model/product.py (+1/-1)
lib/lp/soyuz/tests/test_packagecopyjob.py (+3/-1)
To merge this branch: bzr merge lp:~stevenk/launchpad/format-imports-ad-infinitum
Reviewer Review Type Date Requested Status
William Grant code 2012-09-06 Approve on 2012-09-06
Review via email: mp+122981@code.launchpad.net

Commit Message

Run format-imports over lib/lp once again.

Description of the Change

format-imports over lib/lp once again.

To post a comment you must log in.
William Grant (wgrant) wrote :

The diff in lib/lp/codehosting/__init__.py is slightly suspicious, but possibly harmless. Otherwise fine.

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/blueprints/browser/tests/test_specification.py'
2--- lib/lp/blueprints/browser/tests/test_specification.py 2012-09-04 19:51:25 +0000
3+++ lib/lp/blueprints/browser/tests/test_specification.py 2012-09-06 00:37:19 +0000
4@@ -9,6 +9,7 @@
5
6 from BeautifulSoup import BeautifulSoup
7 import pytz
8+import soupmatchers
9 from testtools.matchers import (
10 Equals,
11 Not,
12@@ -19,7 +20,6 @@
13 from zope.publisher.interfaces import NotFound
14 from zope.security.interfaces import Unauthorized
15 from zope.security.proxy import removeSecurityProxy
16-import soupmatchers
17
18 from lp.app.browser.tales import format_link
19 from lp.blueprints.browser import specification
20
21=== modified file 'lib/lp/blueprints/tests/test_specification.py'
22--- lib/lp/blueprints/tests/test_specification.py 2012-09-05 19:15:18 +0000
23+++ lib/lp/blueprints/tests/test_specification.py 2012-09-06 00:37:19 +0000
24@@ -29,20 +29,20 @@
25 PRIVATE_INFORMATION_TYPES,
26 PUBLIC_INFORMATION_TYPES,
27 )
28-from lp.services.webapp.authorization import check_permission
29 from lp.security import (
30 AdminSpecification,
31 EditSpecificationByRelatedPeople,
32 EditWhiteboardSpecification,
33 ViewSpecification,
34 )
35+from lp.services.webapp.authorization import check_permission
36+from lp.services.webapp.interaction import ANONYMOUS
37 from lp.testing import (
38 login_person,
39 person_logged_in,
40 TestCaseWithFactory,
41 )
42 from lp.testing.layers import DatabaseFunctionalLayer
43-from lp.services.webapp.interaction import ANONYMOUS
44
45
46 class SpecificationTests(TestCaseWithFactory):
47
48=== modified file 'lib/lp/bugs/browser/tests/test_bug_views.py'
49--- lib/lp/bugs/browser/tests/test_bug_views.py 2012-08-30 05:48:03 +0000
50+++ lib/lp/bugs/browser/tests/test_bug_views.py 2012-09-06 00:37:19 +0000
51@@ -20,8 +20,8 @@
52 from zope.security.proxy import removeSecurityProxy
53
54 from lp.registry.enums import (
55+ BugSharingPolicy,
56 InformationType,
57- BugSharingPolicy,
58 )
59 from lp.registry.interfaces.accesspolicy import (
60 IAccessPolicyGrantSource,
61
62=== modified file 'lib/lp/code/browser/tests/test_branch.py'
63--- lib/lp/code/browser/tests/test_branch.py 2012-08-29 06:57:53 +0000
64+++ lib/lp/code/browser/tests/test_branch.py 2012-09-06 00:37:19 +0000
65@@ -40,9 +40,7 @@
66 InformationType,
67 )
68 from lp.registry.interfaces.accesspolicy import IAccessPolicySource
69-from lp.registry.interfaces.person import (
70- PersonVisibility,
71- )
72+from lp.registry.interfaces.person import PersonVisibility
73 from lp.services.config import config
74 from lp.services.database.constants import UTC_NOW
75 from lp.services.helpers import truncate_text
76
77=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
78--- lib/lp/code/browser/tests/test_branchlisting.py 2012-08-21 14:15:43 +0000
79+++ lib/lp/code/browser/tests/test_branchlisting.py 2012-09-06 00:37:19 +0000
80@@ -65,9 +65,7 @@
81 find_main_content,
82 find_tag_by_id,
83 )
84-from lp.testing.sampledata import (
85- ADMIN_EMAIL,
86- )
87+from lp.testing.sampledata import ADMIN_EMAIL
88 from lp.testing.views import (
89 create_initialized_view,
90 create_view,
91
92=== modified file 'lib/lp/code/model/branchnamespace.py'
93--- lib/lp/code/model/branchnamespace.py 2012-08-31 02:24:18 +0000
94+++ lib/lp/code/model/branchnamespace.py 2012-09-06 00:37:19 +0000
95@@ -51,8 +51,8 @@
96 FREE_INFORMATION_TYPES,
97 FREE_PRIVATE_INFORMATION_TYPES,
98 InformationType,
99+ NON_EMBARGOED_INFORMATION_TYPES,
100 PersonVisibility,
101- NON_EMBARGOED_INFORMATION_TYPES,
102 PUBLIC_INFORMATION_TYPES,
103 )
104 from lp.registry.errors import (
105
106=== modified file 'lib/lp/code/model/tests/test_branchcollection.py'
107--- lib/lp/code/model/tests/test_branchcollection.py 2012-08-22 03:18:12 +0000
108+++ lib/lp/code/model/tests/test_branchcollection.py 2012-09-06 00:37:19 +0000
109@@ -32,7 +32,10 @@
110 from lp.code.model.branch import Branch
111 from lp.code.model.branchcollection import GenericBranchCollection
112 from lp.code.tests.helpers import remove_all_sample_data_branches
113-from lp.registry.enums import InformationType, PersonVisibility
114+from lp.registry.enums import (
115+ InformationType,
116+ PersonVisibility,
117+ )
118 from lp.registry.interfaces.person import TeamMembershipPolicy
119 from lp.registry.interfaces.pocket import PackagePublishingPocket
120 from lp.services.webapp.interfaces import (
121
122=== modified file 'lib/lp/code/model/tests/test_branchnamespace.py'
123--- lib/lp/code/model/tests/test_branchnamespace.py 2012-08-29 06:57:53 +0000
124+++ lib/lp/code/model/tests/test_branchnamespace.py 2012-09-06 00:37:19 +0000
125@@ -52,9 +52,7 @@
126 NoSuchSourcePackageName,
127 )
128 from lp.registry.interfaces.distribution import NoSuchDistribution
129-from lp.registry.interfaces.person import (
130- NoSuchPerson,
131- )
132+from lp.registry.interfaces.person import NoSuchPerson
133 from lp.registry.interfaces.product import NoSuchProduct
134 from lp.registry.model.sourcepackage import SourcePackage
135 from lp.testing import (
136
137=== modified file 'lib/lp/codehosting/__init__.py'
138--- lib/lp/codehosting/__init__.py 2012-06-28 12:07:06 +0000
139+++ lib/lp/codehosting/__init__.py 2012-09-06 00:37:19 +0000
140@@ -18,12 +18,11 @@
141
142 import bzrlib
143 from bzrlib.plugin import load_plugins
144-
145-from lp.services.config import config
146-
147 # This import is needed so that bzr's logger gets registered.
148 import bzrlib.trace
149
150+from lp.services.config import config
151+
152
153 def get_bzr_path():
154 """Find the path to the copy of Bazaar for this rocketfuel instance"""
155
156=== modified file 'lib/lp/codehosting/tests/test_safe_open.py'
157--- lib/lp/codehosting/tests/test_safe_open.py 2012-08-22 18:54:06 +0000
158+++ lib/lp/codehosting/tests/test_safe_open.py 2012-09-06 00:37:19 +0000
159@@ -32,9 +32,7 @@
160 SafeBranchOpener,
161 WhitelistPolicy,
162 )
163-from lp.codehosting.tests.helpers import (
164- force_stacked_on_url,
165- )
166+from lp.codehosting.tests.helpers import force_stacked_on_url
167 from lp.testing import TestCase
168
169
170
171=== modified file 'lib/lp/codehosting/tests/test_upgrade.py'
172--- lib/lp/codehosting/tests/test_upgrade.py 2012-08-22 18:54:06 +0000
173+++ lib/lp/codehosting/tests/test_upgrade.py 2012-09-06 00:37:19 +0000
174@@ -28,8 +28,8 @@
175 RepositoryFormat,
176 )
177 from lp.codehosting.bzrutils import read_locked
178+from lp.codehosting.tests.helpers import force_stacked_on_url
179 from lp.codehosting.upgrade import Upgrader
180-from lp.codehosting.tests.helpers import force_stacked_on_url
181 from lp.services.config import config
182 from lp.testing import TestCaseWithFactory
183 from lp.testing.layers import ZopelessDatabaseLayer
184
185=== modified file 'lib/lp/registry/browser/person.py'
186--- lib/lp/registry/browser/person.py 2012-08-20 14:35:40 +0000
187+++ lib/lp/registry/browser/person.py 2012-09-06 00:37:19 +0000
188@@ -124,9 +124,7 @@
189 LaunchpadEditFormView,
190 LaunchpadFormView,
191 )
192-from lp.app.browser.lazrjs import (
193- TextAreaEditorWidget,
194- )
195+from lp.app.browser.lazrjs import TextAreaEditorWidget
196 from lp.app.browser.tales import (
197 DateTimeFormatterAPI,
198 PersonFormatterAPI,
199
200=== modified file 'lib/lp/registry/browser/tests/test_person.py'
201--- lib/lp/registry/browser/tests/test_person.py 2012-08-20 13:28:42 +0000
202+++ lib/lp/registry/browser/tests/test_person.py 2012-09-06 00:37:19 +0000
203@@ -19,9 +19,7 @@
204 from zope.component import getUtility
205 from zope.publisher.interfaces import NotFound
206
207-from lp.app.browser.lazrjs import (
208- TextAreaEditorWidget,
209- )
210+from lp.app.browser.lazrjs import TextAreaEditorWidget
211 from lp.app.errors import NotFoundError
212 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
213 from lp.buildmaster.enums import BuildStatus
214
215=== modified file 'lib/lp/registry/model/product.py'
216--- lib/lp/registry/model/product.py 2012-09-03 11:22:25 +0000
217+++ lib/lp/registry/model/product.py 2012-09-06 00:37:19 +0000
218@@ -125,8 +125,8 @@
219 )
220 from lp.registry.errors import CommercialSubscribersOnly
221 from lp.registry.interfaces.accesspolicy import (
222+ IAccessPolicyArtifactSource,
223 IAccessPolicyGrantSource,
224- IAccessPolicyArtifactSource,
225 IAccessPolicySource,
226 )
227 from lp.registry.interfaces.oopsreferences import IHasOOPSReferences
228
229=== modified file 'lib/lp/soyuz/tests/test_packagecopyjob.py'
230--- lib/lp/soyuz/tests/test_packagecopyjob.py 2012-08-20 18:20:36 +0000
231+++ lib/lp/soyuz/tests/test_packagecopyjob.py 2012-09-06 00:37:19 +0000
232@@ -56,7 +56,9 @@
233 from lp.soyuz.interfaces.sourcepackageformat import (
234 ISourcePackageFormatSelectionSet,
235 )
236-from lp.soyuz.model.distroseriesdifferencejob import FEATURE_FLAG_ENABLE_MODULE
237+from lp.soyuz.model.distroseriesdifferencejob import (
238+ FEATURE_FLAG_ENABLE_MODULE,
239+ )
240 from lp.soyuz.model.packagecopyjob import PackageCopyJob
241 from lp.soyuz.model.queue import PackageUpload
242 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher