Launchpad itself

Merge lp:~stevenk/launchpad/force-bug-enums-into-line into lp:launchpad

  1. force-bug-enums-into-line
  2. Merge into devel
Proposed by Steve Kowalik on 2012-03-13
Status: Merged
Approved by: Steve Kowalik on 2012-03-13
Approved revision: no longer in the source branch.
Merged at revision: 14938
Proposed branch: lp:~stevenk/launchpad/force-bug-enums-into-line
Merge into: lp:launchpad
Diff against target: 425 lines (+33/-33)
33 files modified
cronscripts/send-bug-notifications.py (+1/-1)
lib/lp/_schema_circular_imports.py (+1/-1)
lib/lp/bugs/adapters/bugchange.py (+1/-1)
lib/lp/bugs/adapters/tests/test_bugchange.py (+1/-1)
lib/lp/bugs/browser/bug.py (+1/-1)
lib/lp/bugs/browser/bugsubscription.py (+1/-1)
lib/lp/bugs/browser/bugsubscriptionfilter.py (+1/-1)
lib/lp/bugs/browser/tests/test_bug_context_menu.py (+1/-1)
lib/lp/bugs/browser/tests/test_bugsubscription_views.py (+1/-1)
lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py (+1/-1)
lib/lp/bugs/doc/bug-change.txt (+1/-1)
lib/lp/bugs/doc/bugnotification-sending.txt (+1/-1)
lib/lp/bugs/doc/bugsubscription.txt (+1/-1)
lib/lp/bugs/enums.py (+1/-1)
lib/lp/bugs/interfaces/bugnotification.py (+1/-1)
lib/lp/bugs/interfaces/bugsubscription.py (+1/-1)
lib/lp/bugs/interfaces/bugsubscriptionfilter.py (+1/-1)
lib/lp/bugs/javascript/subscribers.js (+1/-1)
lib/lp/bugs/model/bug.py (+1/-1)
lib/lp/bugs/model/bugnotification.py (+1/-1)
lib/lp/bugs/model/bugsubscription.py (+1/-1)
lib/lp/bugs/model/bugsubscriptionfilter.py (+1/-1)
lib/lp/bugs/model/tests/test_bug.py (+1/-1)
lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py (+1/-1)
lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py (+1/-1)
lib/lp/bugs/scripts/bugnotification.py (+1/-1)
lib/lp/bugs/subscribers/bug.py (+1/-1)
lib/lp/bugs/subscribers/tests/test_bug.py (+1/-1)
lib/lp/bugs/tests/test_bug.py (+1/-1)
lib/lp/bugs/tests/test_bugchanges.py (+1/-1)
lib/lp/bugs/tests/test_bugsubscription.py (+1/-1)
lib/lp/bugs/tests/test_structuralsubscription.py (+1/-1)
lib/lp/services/database/tests/test_bulk.py (+1/-1)
To merge this branch: bzr merge lp:~stevenk/launchpad/force-bug-enums-into-line
Reviewer Review Type Date Requested Status
Ian Booth (community) 2012-03-13 Approve on 2012-03-13
Review via email: mp+97123@code.launchpad.net

Commit Message

Force the bugs enum module to be like the rest and be called 'enums'.

Description of the Change

The following should illustrate the problem quite well:

% find . -name 'enums.py'
./lib/lp/buildmaster/enums.py
./lib/lp/code/enums.py
./lib/lp/translations/enums.py
./lib/lp/registry/enums.py
./lib/lp/app/enums.py
./lib/lp/soyuz/enums.py
./lib/lp/blueprints/enums.py
./lib/lp/answers/enums.py

And then we have the odd one out:

% find . -name 'enum.py'
./lib/lp/bugs/enum.py

Fix it to conform.

To post a comment you must log in.
Ian Booth (wallyworld) wrote :

Yay for consistency.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cronscripts/send-bug-notifications.py'
2--- cronscripts/send-bug-notifications.py 2011-12-30 06:47:17 +0000
3+++ cronscripts/send-bug-notifications.py 2012-03-13 00:53:28 +0000
4@@ -17,7 +17,7 @@
5
6 from zope.component import getUtility
7
8-from lp.bugs.enum import BugNotificationStatus
9+from lp.bugs.enums import BugNotificationStatus
10 from lp.bugs.interfaces.bugnotification import IBugNotificationSet
11 from lp.bugs.scripts.bugnotification import (
12 get_email_notifications,
13
14=== modified file 'lib/lp/_schema_circular_imports.py'
15--- lib/lp/_schema_circular_imports.py 2012-01-17 21:45:24 +0000
16+++ lib/lp/_schema_circular_imports.py 2012-03-13 00:53:28 +0000
17@@ -24,7 +24,7 @@
18 IHasSpecifications,
19 ISpecificationTarget,
20 )
21-from lp.bugs.enum import BugNotificationLevel
22+from lp.bugs.enums import BugNotificationLevel
23 from lp.bugs.interfaces.bug import (
24 IBug,
25 IFrontPageBugAddForm,
26
27=== modified file 'lib/lp/bugs/adapters/bugchange.py'
28--- lib/lp/bugs/adapters/bugchange.py 2012-01-01 02:58:52 +0000
29+++ lib/lp/bugs/adapters/bugchange.py 2012-03-13 00:53:28 +0000
30@@ -49,7 +49,7 @@
31 from zope.interface import implements
32 from zope.security.proxy import isinstance as zope_isinstance
33
34-from lp.bugs.enum import BugNotificationLevel
35+from lp.bugs.enums import BugNotificationLevel
36 from lp.bugs.interfaces.bugchange import IBugChange
37 from lp.bugs.interfaces.bugtask import (
38 IBugTask,
39
40=== modified file 'lib/lp/bugs/adapters/tests/test_bugchange.py'
41--- lib/lp/bugs/adapters/tests/test_bugchange.py 2012-01-01 02:58:52 +0000
42+++ lib/lp/bugs/adapters/tests/test_bugchange.py 2012-03-13 00:53:28 +0000
43@@ -12,7 +12,7 @@
44 get_bug_changes,
45 )
46 from lp.bugs.adapters.bugdelta import BugDelta
47-from lp.bugs.enum import BugNotificationLevel
48+from lp.bugs.enums import BugNotificationLevel
49 from lp.bugs.interfaces.bugtask import BugTaskStatus
50 from lp.bugs.model.bugtask import BugTaskDelta
51 from lp.services.webapp.publisher import canonical_url
52
53=== modified file 'lib/lp/bugs/browser/bug.py'
54--- lib/lp/bugs/browser/bug.py 2012-02-20 00:45:53 +0000
55+++ lib/lp/bugs/browser/bug.py 2012-03-13 00:53:28 +0000
56@@ -71,7 +71,7 @@
57 from lp.app.widgets.project import ProjectScopeWidget
58 from lp.bugs.browser.bugsubscription import BugPortletSubscribersWithDetails
59 from lp.bugs.browser.widgets.bug import BugTagsWidget
60-from lp.bugs.enum import BugNotificationLevel
61+from lp.bugs.enums import BugNotificationLevel
62 from lp.bugs.interfaces.bug import (
63 IBug,
64 IBugSet,
65
66=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
67--- lib/lp/bugs/browser/bugsubscription.py 2012-02-28 04:24:19 +0000
68+++ lib/lp/bugs/browser/bugsubscription.py 2012-03-13 00:53:28 +0000
69@@ -40,7 +40,7 @@
70 from lp.bugs.browser.structuralsubscription import (
71 expose_structural_subscription_data_to_js,
72 )
73-from lp.bugs.enum import BugNotificationLevel
74+from lp.bugs.enums import BugNotificationLevel
75 from lp.bugs.errors import SubscriptionPrivacyViolation
76 from lp.bugs.interfaces.bug import IBug
77 from lp.bugs.interfaces.bugsubscription import IBugSubscription
78
79=== modified file 'lib/lp/bugs/browser/bugsubscriptionfilter.py'
80--- lib/lp/bugs/browser/bugsubscriptionfilter.py 2012-01-01 02:58:52 +0000
81+++ lib/lp/bugs/browser/bugsubscriptionfilter.py 2012-03-13 00:53:28 +0000
82@@ -19,7 +19,7 @@
83 from lp.app.widgets.itemswidgets import LabeledMultiCheckBoxWidget
84 from lp.bugs.browser.bugsubscription import AdvancedSubscriptionMixin
85 from lp.bugs.browser.widgets.bug import BugTagsFrozenSetWidget
86-from lp.bugs.enum import BugNotificationLevel
87+from lp.bugs.enums import BugNotificationLevel
88 from lp.bugs.interfaces.bugsubscriptionfilter import IBugSubscriptionFilter
89 from lp.services.helpers import english_list
90 from lp.services.propertycache import cachedproperty
91
92=== modified file 'lib/lp/bugs/browser/tests/test_bug_context_menu.py'
93--- lib/lp/bugs/browser/tests/test_bug_context_menu.py 2012-01-01 02:58:52 +0000
94+++ lib/lp/bugs/browser/tests/test_bug_context_menu.py 2012-03-13 00:53:28 +0000
95@@ -8,7 +8,7 @@
96 from zope.component import getUtility
97
98 from lp.bugs.browser.bug import BugContextMenu
99-from lp.bugs.enum import BugNotificationLevel
100+from lp.bugs.enums import BugNotificationLevel
101 from lp.services.features import get_relevant_feature_controller
102 from lp.services.webapp.interfaces import IOpenLaunchBag
103 from lp.services.webapp.servers import LaunchpadTestRequest
104
105=== modified file 'lib/lp/bugs/browser/tests/test_bugsubscription_views.py'
106--- lib/lp/bugs/browser/tests/test_bugsubscription_views.py 2012-01-01 02:58:52 +0000
107+++ lib/lp/bugs/browser/tests/test_bugsubscription_views.py 2012-03-13 00:53:28 +0000
108@@ -19,7 +19,7 @@
109 BugSubscriptionListView,
110 BugSubscriptionSubscribeSelfView,
111 )
112-from lp.bugs.enum import BugNotificationLevel
113+from lp.bugs.enums import BugNotificationLevel
114 from lp.registry.interfaces.person import (
115 IPersonSet,
116 PersonVisibility,
117
118=== modified file 'lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py'
119--- lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py 2012-01-01 02:58:52 +0000
120+++ lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py 2012-03-13 00:53:28 +0000
121@@ -17,7 +17,7 @@
122 from lp.bugs.browser.structuralsubscription import (
123 StructuralSubscriptionNavigation,
124 )
125-from lp.bugs.enum import BugNotificationLevel
126+from lp.bugs.enums import BugNotificationLevel
127 from lp.bugs.interfaces.bugtask import (
128 BugTaskImportance,
129 BugTaskStatus,
130
131=== modified file 'lib/lp/bugs/doc/bug-change.txt'
132--- lib/lp/bugs/doc/bug-change.txt 2011-12-24 17:49:30 +0000
133+++ lib/lp/bugs/doc/bug-change.txt 2012-03-13 00:53:28 +0000
134@@ -141,7 +141,7 @@
135
136
137 >>> from lp.testing import person_logged_in
138- >>> from lp.bugs.enum import BugNotificationLevel
139+ >>> from lp.bugs.enums import BugNotificationLevel
140 >>> lifecycle_subscriber = factory.makePerson(
141 ... displayname='Lifecycle subscriber')
142 >>> metadata_subscriber = factory.makePerson(
143
144=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
145--- lib/lp/bugs/doc/bugnotification-sending.txt 2012-01-20 15:42:44 +0000
146+++ lib/lp/bugs/doc/bugnotification-sending.txt 2012-03-13 00:53:28 +0000
147@@ -1110,7 +1110,7 @@
148
149 >>> flush_notifications()
150
151- >>> from lp.bugs.enum import BugNotificationLevel
152+ >>> from lp.bugs.enums import BugNotificationLevel
153 >>> from lp.registry.interfaces.product import IProductSet
154 >>> firefox = getUtility(IProductSet).getByName('firefox')
155 >>> mr_no_privs = getUtility(IPersonSet).getByName('no-priv')
156
157=== modified file 'lib/lp/bugs/doc/bugsubscription.txt'
158--- lib/lp/bugs/doc/bugsubscription.txt 2012-03-08 11:51:36 +0000
159+++ lib/lp/bugs/doc/bugsubscription.txt 2012-03-13 00:53:28 +0000
160@@ -267,7 +267,7 @@
161 With this subscription level, No Privileges Person is returned for all
162 parameter values of level.
163
164- >>> from lp.bugs.enum import BugNotificationLevel
165+ >>> from lp.bugs.enums import BugNotificationLevel
166 >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers(
167 ... level=BugNotificationLevel.COMMENTS))
168 No Privileges Person
169
170=== renamed file 'lib/lp/bugs/enum.py' => 'lib/lp/bugs/enums.py'
171--- lib/lp/bugs/enum.py 2011-09-12 20:11:43 +0000
172+++ lib/lp/bugs/enums.py 2012-03-13 00:53:28 +0000
173@@ -1,4 +1,4 @@
174-# Copyright 2010-2011 Canonical Ltd. This software is licensed under the
175+# Copyright 2010-2012 Canonical Ltd. This software is licensed under the
176 # GNU Affero General Public License version 3 (see the file LICENSE).
177
178 """Enums for the Bugs app."""
179
180=== modified file 'lib/lp/bugs/interfaces/bugnotification.py'
181--- lib/lp/bugs/interfaces/bugnotification.py 2011-12-24 16:54:44 +0000
182+++ lib/lp/bugs/interfaces/bugnotification.py 2012-03-13 00:53:28 +0000
183@@ -26,7 +26,7 @@
184 )
185
186 from lp import _
187-from lp.bugs.enum import BugNotificationStatus
188+from lp.bugs.enums import BugNotificationStatus
189 from lp.bugs.interfaces.bugsubscriptionfilter import IBugSubscriptionFilter
190 from lp.registry.interfaces.role import IHasOwner
191 from lp.services.fields import BugField
192
193=== modified file 'lib/lp/bugs/interfaces/bugsubscription.py'
194--- lib/lp/bugs/interfaces/bugsubscription.py 2011-12-25 03:10:05 +0000
195+++ lib/lp/bugs/interfaces/bugsubscription.py 2012-03-13 00:53:28 +0000
196@@ -32,7 +32,7 @@
197 )
198
199 from lp import _
200-from lp.bugs.enum import BugNotificationLevel
201+from lp.bugs.enums import BugNotificationLevel
202 from lp.services.fields import PersonChoice
203 from lp.services.webservice.apihelpers import patch_reference_property
204
205
206=== modified file 'lib/lp/bugs/interfaces/bugsubscriptionfilter.py'
207--- lib/lp/bugs/interfaces/bugsubscriptionfilter.py 2011-12-24 16:54:44 +0000
208+++ lib/lp/bugs/interfaces/bugsubscriptionfilter.py 2012-03-13 00:53:28 +0000
209@@ -31,7 +31,7 @@
210 )
211
212 from lp import _
213-from lp.bugs.enum import BugNotificationLevel
214+from lp.bugs.enums import BugNotificationLevel
215 from lp.bugs.interfaces.bugtask import (
216 BugTaskImportance,
217 BugTaskStatus,
218
219=== modified file 'lib/lp/bugs/javascript/subscribers.js'
220--- lib/lp/bugs/javascript/subscribers.js 2011-10-31 10:10:58 +0000
221+++ lib/lp/bugs/javascript/subscribers.js 2012-03-13 00:53:28 +0000
222@@ -16,7 +16,7 @@
223 * sections that will hold them.
224 *
225 * These match BugNotificationLevel enum options (as defined in
226- * lib/lp/bugs/enum.py).
227+ * lib/lp/bugs/enums.py).
228 */
229 var subscriber_levels = {
230 'Discussion': 'Notified of all changes',
231
232=== modified file 'lib/lp/bugs/model/bug.py'
233--- lib/lp/bugs/model/bug.py 2012-03-08 22:48:17 +0000
234+++ lib/lp/bugs/model/bug.py 2012-03-13 00:53:28 +0000
235@@ -99,7 +99,7 @@
236 SeriesNominated,
237 UnsubscribedFromBug,
238 )
239-from lp.bugs.enum import BugNotificationLevel
240+from lp.bugs.enums import BugNotificationLevel
241 from lp.bugs.errors import (
242 BugCannotBePrivate,
243 InvalidDuplicateValue,
244
245=== modified file 'lib/lp/bugs/model/bugnotification.py'
246--- lib/lp/bugs/model/bugnotification.py 2012-02-24 01:14:29 +0000
247+++ lib/lp/bugs/model/bugnotification.py 2012-03-13 00:53:28 +0000
248@@ -37,7 +37,7 @@
249 from zope.component import getUtility
250 from zope.interface import implements
251
252-from lp.bugs.enum import BugNotificationStatus
253+from lp.bugs.enums import BugNotificationStatus
254 from lp.bugs.interfaces.bugnotification import (
255 IBugNotification,
256 IBugNotificationFilter,
257
258=== modified file 'lib/lp/bugs/model/bugsubscription.py'
259--- lib/lp/bugs/model/bugsubscription.py 2011-12-30 06:14:56 +0000
260+++ lib/lp/bugs/model/bugsubscription.py 2012-03-13 00:53:28 +0000
261@@ -14,7 +14,7 @@
262 )
263 from zope.interface import implements
264
265-from lp.bugs.enum import BugNotificationLevel
266+from lp.bugs.enums import BugNotificationLevel
267 from lp.bugs.interfaces.bugsubscription import IBugSubscription
268 from lp.registry.interfaces.person import validate_person
269 from lp.registry.interfaces.role import IPersonRoles
270
271=== modified file 'lib/lp/bugs/model/bugsubscriptionfilter.py'
272--- lib/lp/bugs/model/bugsubscriptionfilter.py 2011-12-30 06:14:56 +0000
273+++ lib/lp/bugs/model/bugsubscriptionfilter.py 2012-03-13 00:53:28 +0000
274@@ -23,7 +23,7 @@
275 )
276 from zope.interface import implements
277
278-from lp.bugs.enum import BugNotificationLevel
279+from lp.bugs.enums import BugNotificationLevel
280 from lp.bugs.interfaces.bugsubscriptionfilter import (
281 IBugSubscriptionFilter,
282 IBugSubscriptionFilterMute,
283
284=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
285--- lib/lp/bugs/model/tests/test_bug.py 2012-02-24 04:00:24 +0000
286+++ lib/lp/bugs/model/tests/test_bug.py 2012-03-13 00:53:28 +0000
287@@ -15,7 +15,7 @@
288 from zope.security.proxy import removeSecurityProxy
289
290 from lp.bugs.adapters.bugchange import BugTitleChange
291-from lp.bugs.enum import (
292+from lp.bugs.enums import (
293 BugNotificationLevel,
294 BugNotificationStatus,
295 )
296
297=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py'
298--- lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py 2012-01-01 02:58:52 +0000
299+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py 2012-03-13 00:53:28 +0000
300@@ -12,7 +12,7 @@
301 removeSecurityProxy,
302 )
303
304-from lp.bugs.enum import BugNotificationLevel
305+from lp.bugs.enums import BugNotificationLevel
306 from lp.bugs.interfaces.bugtask import (
307 BugTaskImportance,
308 BugTaskStatus,
309
310=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py'
311--- lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py 2012-03-07 01:59:58 +0000
312+++ lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py 2012-03-13 00:53:28 +0000
313@@ -13,7 +13,7 @@
314 from zope.security.checker import getChecker
315
316 from lp.app.interfaces.security import IAuthorization
317-from lp.bugs.enum import BugNotificationLevel
318+from lp.bugs.enums import BugNotificationLevel
319 from lp.bugs.model.bug import (
320 BugSubscriberSet,
321 BugSubscriptionInfo,
322
323=== modified file 'lib/lp/bugs/scripts/bugnotification.py'
324--- lib/lp/bugs/scripts/bugnotification.py 2012-01-01 02:58:52 +0000
325+++ lib/lp/bugs/scripts/bugnotification.py 2012-03-13 00:53:28 +0000
326@@ -20,7 +20,7 @@
327 import transaction
328 from zope.component import getUtility
329
330-from lp.bugs.enum import BugNotificationLevel
331+from lp.bugs.enums import BugNotificationLevel
332 from lp.bugs.interfaces.bugnotification import IBugNotificationSet
333 from lp.bugs.mail.bugnotificationbuilder import (
334 BugNotificationBuilder,
335
336=== modified file 'lib/lp/bugs/subscribers/bug.py'
337--- lib/lp/bugs/subscribers/bug.py 2011-12-30 06:14:56 +0000
338+++ lib/lp/bugs/subscribers/bug.py 2012-03-13 00:53:28 +0000
339@@ -23,7 +23,7 @@
340 get_bug_changes,
341 )
342 from lp.bugs.adapters.bugdelta import BugDelta
343-from lp.bugs.enum import BugNotificationLevel
344+from lp.bugs.enums import BugNotificationLevel
345 from lp.bugs.mail.bugnotificationbuilder import BugNotificationBuilder
346 from lp.bugs.mail.bugnotificationrecipients import BugNotificationRecipients
347 from lp.bugs.mail.newbug import generate_bug_add_email
348
349=== modified file 'lib/lp/bugs/subscribers/tests/test_bug.py'
350--- lib/lp/bugs/subscribers/tests/test_bug.py 2012-01-01 02:58:52 +0000
351+++ lib/lp/bugs/subscribers/tests/test_bug.py 2012-03-13 00:53:28 +0000
352@@ -7,7 +7,7 @@
353 from testtools.matchers import Is
354
355 from lp.bugs.adapters.bugdelta import BugDelta
356-from lp.bugs.enum import BugNotificationLevel
357+from lp.bugs.enums import BugNotificationLevel
358 from lp.bugs.interfaces.bugtask import BugTaskStatus
359 from lp.bugs.model.bugnotification import (
360 BugNotification,
361
362=== modified file 'lib/lp/bugs/tests/test_bug.py'
363--- lib/lp/bugs/tests/test_bug.py 2012-03-02 00:19:37 +0000
364+++ lib/lp/bugs/tests/test_bug.py 2012-03-13 00:53:28 +0000
365@@ -10,7 +10,7 @@
366 from zope.interface import providedBy
367 from zope.security.proxy import removeSecurityProxy
368
369-from lp.bugs.enum import BugNotificationLevel
370+from lp.bugs.enums import BugNotificationLevel
371 from lp.bugs.interfaces.bug import (
372 CreateBugParams,
373 IBugSet,
374
375=== modified file 'lib/lp/bugs/tests/test_bugchanges.py'
376--- lib/lp/bugs/tests/test_bugchanges.py 2012-03-08 11:51:36 +0000
377+++ lib/lp/bugs/tests/test_bugchanges.py 2012-03-13 00:53:28 +0000
378@@ -13,7 +13,7 @@
379 from zope.event import notify
380 from zope.interface import providedBy
381
382-from lp.bugs.enum import BugNotificationLevel
383+from lp.bugs.enums import BugNotificationLevel
384 from lp.bugs.interfaces.bugtask import (
385 BugTaskImportance,
386 BugTaskStatus,
387
388=== modified file 'lib/lp/bugs/tests/test_bugsubscription.py'
389--- lib/lp/bugs/tests/test_bugsubscription.py 2012-01-01 02:58:52 +0000
390+++ lib/lp/bugs/tests/test_bugsubscription.py 2012-03-13 00:53:28 +0000
391@@ -12,7 +12,7 @@
392 )
393 from zope.security.interfaces import Unauthorized
394
395-from lp.bugs.enum import BugNotificationLevel
396+from lp.bugs.enums import BugNotificationLevel
397 from lp.registry.interfaces.teammembership import TeamMembershipStatus
398 from lp.testing import (
399 launchpadlib_for,
400
401=== modified file 'lib/lp/bugs/tests/test_structuralsubscription.py'
402--- lib/lp/bugs/tests/test_structuralsubscription.py 2012-01-03 14:18:27 +0000
403+++ lib/lp/bugs/tests/test_structuralsubscription.py 2012-03-13 00:53:28 +0000
404@@ -13,7 +13,7 @@
405 from testtools.matchers import StartsWith
406 from zope.security.interfaces import Unauthorized
407
408-from lp.bugs.enum import BugNotificationLevel
409+from lp.bugs.enums import BugNotificationLevel
410 from lp.bugs.interfaces.bugtask import (
411 BugTaskImportance,
412 BugTaskStatus,
413
414=== modified file 'lib/lp/services/database/tests/test_bulk.py'
415--- lib/lp/services/database/tests/test_bulk.py 2012-02-27 04:29:39 +0000
416+++ lib/lp/services/database/tests/test_bulk.py 2012-03-13 00:53:28 +0000
417@@ -19,7 +19,7 @@
418 proxy,
419 )
420
421-from lp.bugs.enum import BugNotificationLevel
422+from lp.bugs.enums import BugNotificationLevel
423 from lp.bugs.model.bug import BugAffectsPerson
424 from lp.bugs.model.bugsubscription import BugSubscription
425 from lp.code.model.branchjob import (