Launchpad itself

Merge lp:~allenap/launchpad/remove-with-statement into lp:launchpad

  1. remove-with-statement
  2. Merge into devel
Proposed by Gavin Panella
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 11802
Proposed branch: lp:~allenap/launchpad/remove-with-statement
Merge into: lp:launchpad
Diff against target: 1278 lines (+0/-194)
97 files modified
lib/canonical/buildd/pottery/intltool.py (+0/-2)
lib/canonical/config/fixture.py (+0/-1)
lib/canonical/launchpad/daemons/tachandler.py (+0/-2)
lib/canonical/launchpad/ftests/test_system_documentation.py (+0/-4)
lib/canonical/launchpad/mail/tests/test_handlers.py (+0/-2)
lib/canonical/launchpad/readonly.py (+0/-2)
lib/canonical/launchpad/scripts/oops.py (+0/-2)
lib/canonical/launchpad/testing/pages.py (+0/-3)
lib/canonical/launchpad/testing/systemdocs.py (+0/-3)
lib/canonical/launchpad/webapp/login.py (+0/-2)
lib/canonical/launchpad/webapp/tests/test_errorlog.py (+0/-1)
lib/canonical/launchpad/webapp/tests/test_login.py (+0/-2)
lib/canonical/launchpad/windmill/tests/test_widgets.py (+0/-2)
lib/canonical/testing/parallel.py (+0/-2)
lib/canonical/testing/tests/test_parallel.py (+0/-2)
lib/devscripts/ec2test/entrypoint.py (+0/-2)
lib/devscripts/ec2test/remote.py (+0/-2)
lib/lp/answers/browser/tests/test_questiontarget.py (+0/-2)
lib/lp/archiveuploader/tests/__init__.py (+0/-2)
lib/lp/bugs/browser/tests/test_bugtask.py (+0/-2)
lib/lp/bugs/browser/tests/test_bugtracker_views.py (+0/-2)
lib/lp/bugs/model/tests/test_bug.py (+0/-2)
lib/lp/bugs/scripts/checkwatches/base.py (+0/-2)
lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py (+0/-2)
lib/lp/bugs/scripts/checkwatches/core.py (+0/-2)
lib/lp/bugs/scripts/checkwatches/remotebugupdater.py (+0/-2)
lib/lp/bugs/scripts/checkwatches/tests/test_base.py (+0/-2)
lib/lp/bugs/scripts/checkwatches/tests/test_core.py (+0/-2)
lib/lp/bugs/tests/test_bugbranch.py (+0/-2)
lib/lp/buildmaster/model/packagebuild.py (+0/-2)
lib/lp/buildmaster/tests/test_packagebuild.py (+0/-2)
lib/lp/code/browser/tests/test_branch.py (+0/-2)
lib/lp/code/browser/tests/test_branchlisting.py (+0/-2)
lib/lp/code/browser/tests/test_codereviewcomment.py (+0/-2)
lib/lp/code/browser/tests/test_codereviewvote.py (+0/-2)
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+0/-2)
lib/lp/code/mail/codehandler.py (+0/-3)
lib/lp/code/mail/tests/test_codehandler.py (+0/-2)
lib/lp/code/model/branchmergeproposaljob.py (+0/-3)
lib/lp/code/model/directbranchcommit.py (+0/-2)
lib/lp/code/model/tests/test_branch.py (+0/-2)
lib/lp/code/model/tests/test_branchjob.py (+0/-2)
lib/lp/code/model/tests/test_branchmergeproposal.py (+0/-2)
lib/lp/code/model/tests/test_branchmergeproposaljobs.py (+0/-2)
lib/lp/code/model/tests/test_branchsubscription.py (+0/-2)
lib/lp/code/model/tests/test_diff.py (+0/-2)
lib/lp/code/model/tests/test_recipebuilder.py (+0/-2)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+0/-2)
lib/lp/code/model/tests/test_sourcepackagerecipebuild.py (+0/-2)
lib/lp/code/scripts/tests/test_scan_branches.py (+0/-2)
lib/lp/code/scripts/tests/test_sendbranchmail.py (+0/-2)
lib/lp/code/xmlrpc/tests/test_branch.py (+0/-2)
lib/lp/codehosting/codeimport/tests/servers.py (+0/-2)
lib/lp/codehosting/scanner/tests/test_buglinks.py (+0/-2)
lib/lp/codehosting/scanner/tests/test_bzrsync.py (+0/-2)
lib/lp/codehosting/scanner/tests/test_mergedetection.py (+0/-2)
lib/lp/codehosting/tests/test_branchdistro.py (+0/-2)
lib/lp/codehosting/tests/test_jobs.py (+0/-2)
lib/lp/codehosting/tests/test_sftp.py (+0/-1)
lib/lp/registry/browser/tests/test_distroseriesdifference_views.py (+0/-2)
lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py (+0/-2)
lib/lp/registry/browser/tests/test_mailinglists.py (+0/-2)
lib/lp/registry/browser/tests/test_milestone.py (+0/-2)
lib/lp/registry/browser/tests/test_peoplemerge.py (+0/-2)
lib/lp/registry/browser/tests/test_series_views.py (+0/-2)
lib/lp/registry/model/person.py (+0/-2)
lib/lp/registry/tests/test_add_member.py (+0/-2)
lib/lp/registry/tests/test_distroseries.py (+0/-2)
lib/lp/registry/tests/test_distroseriesdifference.py (+0/-2)
lib/lp/registry/tests/test_mailinglist.py (+0/-2)
lib/lp/registry/tests/test_mailinglistapi.py (+0/-2)
lib/lp/registry/tests/test_person.py (+0/-2)
lib/lp/registry/tests/test_sourcepackage.py (+0/-2)
lib/lp/services/features/tests/test_db_settings.py (+0/-1)
lib/lp/services/features/tests/test_flags.py (+0/-1)
lib/lp/services/job/runner.py (+0/-1)
lib/lp/services/job/tests/test_runner.py (+0/-2)
lib/lp/services/log/tests/test_uniquefileallocator.py (+0/-1)
lib/lp/services/mailman/tests/test_lpmoderate.py (+0/-2)
lib/lp/services/spriteutils.py (+0/-2)
lib/lp/services/utils.py (+0/-2)
lib/lp/soyuz/browser/tests/test_archive_webservice.py (+0/-2)
lib/lp/soyuz/scripts/tests/test_queue.py (+0/-2)
lib/lp/soyuz/tests/test_archive.py (+0/-2)
lib/lp/soyuz/tests/test_archive_subscriptions.py (+0/-2)
lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py (+0/-2)
lib/lp/soyuz/tests/test_copyarchivejob.py (+0/-2)
lib/lp/testing/__init__.py (+0/-3)
lib/lp/testing/_login.py (+0/-2)
lib/lp/testing/factory.py (+0/-2)
lib/lp/testing/tests/test_login.py (+0/-2)
lib/lp/testing/tests/test_testing.py (+0/-2)
lib/lp/translations/pottery/detect_intltool.py (+0/-2)
lib/lp/translations/tests/test_autoapproval.py (+0/-2)
lib/lp/translations/tests/test_pottery_detect_intltool.py (+0/-2)
lib/lp/translations/tests/test_rosetta_branches_script.py (+0/-2)
lib/lp/translations/tests/test_translationimportqueue.py (+0/-2)
To merge this branch: bzr merge lp:~allenap/launchpad/remove-with-statement
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+39381@code.launchpad.net

Commit message

Remove with_statement.

Description of the change

Now we're officially on Python 2.6, remove all the with_statement stuff from the tree.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Woot! Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/buildd/pottery/intltool.py'
2--- lib/canonical/buildd/pottery/intltool.py 2010-06-30 15:46:36 +0000
3+++ lib/canonical/buildd/pottery/intltool.py 2010-10-26 15:55:46 +0000
4@@ -3,8 +3,6 @@
5
6 """Functions to build PO templates on the build slave."""
7
8-from __future__ import with_statement
9-
10 __metaclass__ = type
11 __all__ = [
12 'check_potfiles_in',
13
14=== modified file 'lib/canonical/config/fixture.py'
15--- lib/canonical/config/fixture.py 2010-10-19 19:23:19 +0000
16+++ lib/canonical/config/fixture.py 2010-10-26 15:55:46 +0000
17@@ -1,7 +1,6 @@
18 # Copyright 2010 Canonical Ltd. This software is licensed under the
19 # GNU Affero General Public License version 3 (see the file LICENSE).
20
21-from __future__ import with_statement
22 """Fixtures related to configs.
23
24 XXX: Robert Collins 2010-10-20 bug=663454 this is in the wrong namespace.
25
26=== modified file 'lib/canonical/launchpad/daemons/tachandler.py'
27--- lib/canonical/launchpad/daemons/tachandler.py 2010-10-20 18:43:29 +0000
28+++ lib/canonical/launchpad/daemons/tachandler.py 2010-10-26 15:55:46 +0000
29@@ -1,8 +1,6 @@
30 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
31 # GNU Affero General Public License version 3 (see the file LICENSE).
32
33-from __future__ import with_statement
34-
35 """Test harness for TAC (Twisted Application Configuration) files."""
36
37 __metaclass__ = type
38
39=== modified file 'lib/canonical/launchpad/ftests/test_system_documentation.py'
40--- lib/canonical/launchpad/ftests/test_system_documentation.py 2010-10-20 20:51:26 +0000
41+++ lib/canonical/launchpad/ftests/test_system_documentation.py 2010-10-26 15:55:46 +0000
42@@ -7,8 +7,6 @@
43 """
44 # pylint: disable-msg=C0103
45
46-from __future__ import with_statement
47-
48 import logging
49 import os
50 import unittest
51@@ -358,8 +356,6 @@
52 one_test = LayeredDocFileSuite(
53 path, setUp=setUp, tearDown=tearDown,
54 layer=LaunchpadFunctionalLayer,
55- # 'icky way of running doctests with __future__ imports
56- globs={'with_statement': with_statement},
57 stdout_logging_level=logging.WARNING)
58 suite.addTest(one_test)
59
60
61=== modified file 'lib/canonical/launchpad/mail/tests/test_handlers.py'
62--- lib/canonical/launchpad/mail/tests/test_handlers.py 2010-10-12 01:11:41 +0000
63+++ lib/canonical/launchpad/mail/tests/test_handlers.py 2010-10-26 15:55:46 +0000
64@@ -1,8 +1,6 @@
65 # Copyright 2009 Canonical Ltd. This software is licensed under the
66 # GNU Affero General Public License version 3 (see the file LICENSE).
67
68-from __future__ import with_statement
69-
70 __metaclass__ = type
71
72 from doctest import DocTestSuite
73
74=== modified file 'lib/canonical/launchpad/readonly.py'
75--- lib/canonical/launchpad/readonly.py 2010-08-20 20:31:18 +0000
76+++ lib/canonical/launchpad/readonly.py 2010-10-26 15:55:46 +0000
77@@ -7,8 +7,6 @@
78 named read-only.txt in the root of the Launchpad tree.
79 """
80
81-from __future__ import with_statement
82-
83 __metaclass__ = type
84 __all__ = [
85 'is_read_only',
86
87=== modified file 'lib/canonical/launchpad/scripts/oops.py'
88--- lib/canonical/launchpad/scripts/oops.py 2010-09-09 06:04:24 +0000
89+++ lib/canonical/launchpad/scripts/oops.py 2010-10-26 15:55:46 +0000
90@@ -3,8 +3,6 @@
91
92 """Module docstring goes here."""
93
94-from __future__ import with_statement
95-
96 __metaclass__ = type
97
98 __all__ = [
99
100=== modified file 'lib/canonical/launchpad/testing/pages.py'
101--- lib/canonical/launchpad/testing/pages.py 2010-10-12 05:32:24 +0000
102+++ lib/canonical/launchpad/testing/pages.py 2010-10-26 15:55:46 +0000
103@@ -1,8 +1,6 @@
104 # Copyright 2009 Canonical Ltd. This software is licensed under the
105 # GNU Affero General Public License version 3 (see the file LICENSE).
106
107-from __future__ import with_statement
108-
109 """Testing infrastructure for page tests."""
110
111 # Stop lint warning about not initializing TestCase parent on
112@@ -813,7 +811,6 @@
113 test.globs['print_tag_with_id'] = print_tag_with_id
114 test.globs['PageTestLayer'] = PageTestLayer
115 test.globs['stop'] = stop
116- test.globs['with_statement'] = with_statement
117 test.globs['ws_uncache'] = ws_uncache
118
119
120
121=== modified file 'lib/canonical/launchpad/testing/systemdocs.py'
122--- lib/canonical/launchpad/testing/systemdocs.py 2010-10-03 15:30:06 +0000
123+++ lib/canonical/launchpad/testing/systemdocs.py 2010-10-26 15:55:46 +0000
124@@ -3,8 +3,6 @@
125
126 """Infrastructure for setting up doctests."""
127
128-from __future__ import with_statement
129-
130 __metaclass__ = type
131 __all__ = [
132 'default_optionflags',
133@@ -211,7 +209,6 @@
134 test.globs['verifyObject'] = verifyObject
135 test.globs['pretty'] = pprint.PrettyPrinter(width=1).pformat
136 test.globs['stop'] = stop
137- test.globs['with_statement'] = with_statement
138 test.globs['launchpadlib_for'] = launchpadlib_for
139 test.globs['launchpadlib_credentials_for'] = launchpadlib_credentials_for
140 test.globs['oauth_access_token_for'] = oauth_access_token_for
141
142=== modified file 'lib/canonical/launchpad/webapp/login.py'
143--- lib/canonical/launchpad/webapp/login.py 2010-09-03 16:43:11 +0000
144+++ lib/canonical/launchpad/webapp/login.py 2010-10-26 15:55:46 +0000
145@@ -2,8 +2,6 @@
146 # GNU Affero General Public License version 3 (see the file LICENSE).
147 """Stuff to do with logging in and logging out."""
148
149-from __future__ import with_statement
150-
151 __metaclass__ = type
152
153 from datetime import (
154
155=== modified file 'lib/canonical/launchpad/webapp/tests/test_errorlog.py'
156--- lib/canonical/launchpad/webapp/tests/test_errorlog.py 2010-10-13 16:44:44 +0000
157+++ lib/canonical/launchpad/webapp/tests/test_errorlog.py 2010-10-26 15:55:46 +0000
158@@ -3,7 +3,6 @@
159
160 """Tests for error logging & OOPS reporting."""
161
162-from __future__ import with_statement
163 __metaclass__ = type
164
165 import datetime
166
167=== modified file 'lib/canonical/launchpad/webapp/tests/test_login.py'
168--- lib/canonical/launchpad/webapp/tests/test_login.py 2010-09-03 11:10:09 +0000
169+++ lib/canonical/launchpad/webapp/tests/test_login.py 2010-10-26 15:55:46 +0000
170@@ -1,6 +1,4 @@
171 # Copyright 2009-2010 Canonical Ltd. All rights reserved.
172-from __future__ import with_statement
173-
174 # pylint: disable-msg=W0105
175 """Test harness for running the new-login.txt tests."""
176
177
178=== modified file 'lib/canonical/launchpad/windmill/tests/test_widgets.py'
179--- lib/canonical/launchpad/windmill/tests/test_widgets.py 2010-08-20 20:31:18 +0000
180+++ lib/canonical/launchpad/windmill/tests/test_widgets.py 2010-10-26 15:55:46 +0000
181@@ -3,8 +3,6 @@
182
183 """Tests for the Windmill test doubles themselves."""
184
185-from __future__ import with_statement
186-
187 __metaclass__ = type
188
189 from mocker import (
190
191=== modified file 'lib/canonical/testing/parallel.py'
192--- lib/canonical/testing/parallel.py 2010-10-16 18:20:17 +0000
193+++ lib/canonical/testing/parallel.py 2010-10-26 15:55:46 +0000
194@@ -1,8 +1,6 @@
195 # Copyright 2010 Canonical Ltd. This software is licensed under the
196 # GNU Affero General Public License version 3 (see the file LICENSE).
197
198-from __future__ import with_statement
199-
200 """Parallel test glue."""
201
202 __metaclass__ = type
203
204=== modified file 'lib/canonical/testing/tests/test_parallel.py'
205--- lib/canonical/testing/tests/test_parallel.py 2010-10-16 18:20:17 +0000
206+++ lib/canonical/testing/tests/test_parallel.py 2010-10-26 15:55:46 +0000
207@@ -1,8 +1,6 @@
208 # Copyright 2010 Canonical Ltd. This software is licensed under the
209 # GNU Affero General Public License version 3 (see the file LICENSE).
210
211-from __future__ import with_statement
212-
213 """Parallel test glue."""
214
215 __metaclass__ = type
216
217=== modified file 'lib/devscripts/ec2test/entrypoint.py'
218--- lib/devscripts/ec2test/entrypoint.py 2010-08-26 04:33:36 +0000
219+++ lib/devscripts/ec2test/entrypoint.py 2010-10-26 15:55:46 +0000
220@@ -3,8 +3,6 @@
221
222 """The entry point for the 'ec2' utility."""
223
224-from __future__ import with_statement
225-
226 __metaclass__ = type
227 __all__ = [
228 'main',
229
230=== modified file 'lib/devscripts/ec2test/remote.py'
231--- lib/devscripts/ec2test/remote.py 2010-09-20 22:44:49 +0000
232+++ lib/devscripts/ec2test/remote.py 2010-10-26 15:55:46 +0000
233@@ -16,8 +16,6 @@
234 the responsibility of handling the results that `LaunchpadTester` gathers.
235 """
236
237-from __future__ import with_statement
238-
239 __metatype__ = type
240
241 import datetime
242
243=== modified file 'lib/lp/answers/browser/tests/test_questiontarget.py'
244--- lib/lp/answers/browser/tests/test_questiontarget.py 2010-10-04 19:50:45 +0000
245+++ lib/lp/answers/browser/tests/test_questiontarget.py 2010-10-26 15:55:46 +0000
246@@ -3,8 +3,6 @@
247
248 """Test questiontarget views."""
249
250-from __future__ import with_statement
251-
252 __metaclass__ = type
253
254 import os
255
256=== modified file 'lib/lp/archiveuploader/tests/__init__.py'
257--- lib/lp/archiveuploader/tests/__init__.py 2010-10-06 11:46:51 +0000
258+++ lib/lp/archiveuploader/tests/__init__.py 2010-10-26 15:55:46 +0000
259@@ -3,8 +3,6 @@
260
261 """Tests for the archive uploader."""
262
263-from __future__ import with_statement
264-
265 __metaclass__ = type
266
267 __all__ = [
268
269=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
270--- lib/lp/bugs/browser/tests/test_bugtask.py 2010-10-07 04:28:17 +0000
271+++ lib/lp/bugs/browser/tests/test_bugtask.py 2010-10-26 15:55:46 +0000
272@@ -1,8 +1,6 @@
273 # Copyright 2009 Canonical Ltd. This software is licensed under the
274 # GNU Affero General Public License version 3 (see the file LICENSE).
275
276-from __future__ import with_statement
277-
278 __metaclass__ = type
279
280
281
282=== modified file 'lib/lp/bugs/browser/tests/test_bugtracker_views.py'
283--- lib/lp/bugs/browser/tests/test_bugtracker_views.py 2010-09-19 23:52:49 +0000
284+++ lib/lp/bugs/browser/tests/test_bugtracker_views.py 2010-10-26 15:55:46 +0000
285@@ -3,8 +3,6 @@
286
287 """Tests for BugTracker views."""
288
289-from __future__ import with_statement
290-
291 __metaclass__ = type
292
293 from zope.component import getUtility
294
295=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
296--- lib/lp/bugs/model/tests/test_bug.py 2010-10-25 13:46:12 +0000
297+++ lib/lp/bugs/model/tests/test_bug.py 2010-10-26 15:55:46 +0000
298@@ -1,8 +1,6 @@
299 # Copyright 2010 Canonical Ltd. This software is licensed under the
300 # GNU Affero General Public License version 3 (see the file LICENSE).
301
302-from __future__ import with_statement
303-
304 __metaclass__ = type
305
306 from canonical.testing.layers import DatabaseFunctionalLayer
307
308=== modified file 'lib/lp/bugs/scripts/checkwatches/base.py'
309--- lib/lp/bugs/scripts/checkwatches/base.py 2010-08-20 20:31:18 +0000
310+++ lib/lp/bugs/scripts/checkwatches/base.py 2010-10-26 15:55:46 +0000
311@@ -3,8 +3,6 @@
312
313 """Common classes and functions for the checkwatches system."""
314
315-from __future__ import with_statement
316-
317 __metaclass__ = type
318 __all__ = [
319 'WorkingBase',
320
321=== modified file 'lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py'
322--- lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py 2010-10-03 15:30:06 +0000
323+++ lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py 2010-10-26 15:55:46 +0000
324@@ -3,8 +3,6 @@
325
326 """Classes and logic for the checkwatches BugWatchUpdater."""
327
328-from __future__ import with_statement
329-
330 __metaclass__ = type
331 __all__ = [
332 'BugWatchUpdater',
333
334=== modified file 'lib/lp/bugs/scripts/checkwatches/core.py'
335--- lib/lp/bugs/scripts/checkwatches/core.py 2010-10-03 15:30:06 +0000
336+++ lib/lp/bugs/scripts/checkwatches/core.py 2010-10-26 15:55:46 +0000
337@@ -3,8 +3,6 @@
338
339 """Classes and logic for the checkwatches cronscript."""
340
341-from __future__ import with_statement
342-
343 __metaclass__ = type
344 __all__ = [
345 'BaseScheduler',
346
347=== modified file 'lib/lp/bugs/scripts/checkwatches/remotebugupdater.py'
348--- lib/lp/bugs/scripts/checkwatches/remotebugupdater.py 2010-08-20 20:31:18 +0000
349+++ lib/lp/bugs/scripts/checkwatches/remotebugupdater.py 2010-10-26 15:55:46 +0000
350@@ -3,8 +3,6 @@
351
352 """Classes and logic for the remote bug updater."""
353
354-from __future__ import with_statement
355-
356 __metaclass__ = type
357 __all__ = [
358 'RemoteBugUpdater',
359
360=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_base.py'
361--- lib/lp/bugs/scripts/checkwatches/tests/test_base.py 2010-10-04 19:50:45 +0000
362+++ lib/lp/bugs/scripts/checkwatches/tests/test_base.py 2010-10-26 15:55:46 +0000
363@@ -3,8 +3,6 @@
364
365 """Tests for the `base` module."""
366
367-from __future__ import with_statement
368-
369 __metaclass__ = type
370
371 from contextlib import contextmanager
372
373=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_core.py'
374--- lib/lp/bugs/scripts/checkwatches/tests/test_core.py 2010-10-21 04:19:36 +0000
375+++ lib/lp/bugs/scripts/checkwatches/tests/test_core.py 2010-10-26 15:55:46 +0000
376@@ -2,8 +2,6 @@
377 # GNU Affero General Public License version 3 (see the file LICENSE).
378 """Checkwatches unit tests."""
379
380-from __future__ import with_statement
381-
382 __metaclass__ = type
383
384 from datetime import datetime
385
386=== modified file 'lib/lp/bugs/tests/test_bugbranch.py'
387--- lib/lp/bugs/tests/test_bugbranch.py 2010-10-04 19:50:45 +0000
388+++ lib/lp/bugs/tests/test_bugbranch.py 2010-10-26 15:55:46 +0000
389@@ -1,8 +1,6 @@
390 # Copyright 2010 Canonical Ltd. This software is licensed under the
391 # GNU Affero General Public License version 3 (see the file LICENSE).
392
393-from __future__ import with_statement
394-
395 """Tests for bug-branch linking from the bugs side."""
396
397 __metaclass__ = type
398
399=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
400--- lib/lp/buildmaster/model/packagebuild.py 2010-10-02 11:41:43 +0000
401+++ lib/lp/buildmaster/model/packagebuild.py 2010-10-26 15:55:46 +0000
402@@ -1,8 +1,6 @@
403 # Copyright 2010 Canonical Ltd. This software is licensed under the
404 # GNU Affero General Public License version 3 (see the file LICENSE).
405
406-from __future__ import with_statement
407-
408 __metaclass__ = type
409 __all__ = [
410 'PackageBuild',
411
412=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
413--- lib/lp/buildmaster/tests/test_packagebuild.py 2010-10-02 11:41:43 +0000
414+++ lib/lp/buildmaster/tests/test_packagebuild.py 2010-10-26 15:55:46 +0000
415@@ -3,8 +3,6 @@
416
417 """Tests for `IPackageBuild`."""
418
419-from __future__ import with_statement
420-
421 __metaclass__ = type
422
423 from datetime import datetime
424
425=== modified file 'lib/lp/code/browser/tests/test_branch.py'
426--- lib/lp/code/browser/tests/test_branch.py 2010-10-04 19:50:45 +0000
427+++ lib/lp/code/browser/tests/test_branch.py 2010-10-26 15:55:46 +0000
428@@ -3,8 +3,6 @@
429
430 """Unit tests for BranchView."""
431
432-from __future__ import with_statement
433-
434 __metaclass__ = type
435
436 from datetime import (
437
438=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
439--- lib/lp/code/browser/tests/test_branchlisting.py 2010-10-23 04:41:42 +0000
440+++ lib/lp/code/browser/tests/test_branchlisting.py 2010-10-26 15:55:46 +0000
441@@ -3,8 +3,6 @@
442
443 """Tests for branch listing."""
444
445-from __future__ import with_statement
446-
447 __metaclass__ = type
448
449 from datetime import timedelta
450
451=== modified file 'lib/lp/code/browser/tests/test_codereviewcomment.py'
452--- lib/lp/code/browser/tests/test_codereviewcomment.py 2010-10-06 18:53:53 +0000
453+++ lib/lp/code/browser/tests/test_codereviewcomment.py 2010-10-26 15:55:46 +0000
454@@ -3,8 +3,6 @@
455
456 """Unit tests for CodeReviewComments."""
457
458-from __future__ import with_statement
459-
460 __metaclass__ = type
461
462 import unittest
463
464=== modified file 'lib/lp/code/browser/tests/test_codereviewvote.py'
465--- lib/lp/code/browser/tests/test_codereviewvote.py 2010-10-04 19:50:45 +0000
466+++ lib/lp/code/browser/tests/test_codereviewvote.py 2010-10-26 15:55:46 +0000
467@@ -3,8 +3,6 @@
468
469 """Unit tests for CodeReviewVoteReferences."""
470
471-from __future__ import with_statement
472-
473 __metaclass__ = type
474
475
476
477=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
478--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-10-04 19:50:45 +0000
479+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-10-26 15:55:46 +0000
480@@ -4,8 +4,6 @@
481
482 """Tests for the source package recipe view classes and templates."""
483
484-from __future__ import with_statement
485-
486 __metaclass__ = type
487
488
489
490=== modified file 'lib/lp/code/mail/codehandler.py'
491--- lib/lp/code/mail/codehandler.py 2010-09-23 20:38:59 +0000
492+++ lib/lp/code/mail/codehandler.py 2010-10-26 15:55:46 +0000
493@@ -1,9 +1,6 @@
494 # Copyright 2009 Canonical Ltd. This software is licensed under the
495 # GNU Affero General Public License version 3 (see the file LICENSE).
496
497-from __future__ import with_statement
498-
499-
500 __metaclass__ = type
501
502
503
504=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
505--- lib/lp/code/mail/tests/test_codehandler.py 2010-10-18 01:55:45 +0000
506+++ lib/lp/code/mail/tests/test_codehandler.py 2010-10-26 15:55:46 +0000
507@@ -3,8 +3,6 @@
508
509 """Testing the CodeHandler."""
510
511-from __future__ import with_statement
512-
513 __metaclass__ = type
514
515 from difflib import unified_diff
516
517=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
518--- lib/lp/code/model/branchmergeproposaljob.py 2010-10-18 01:57:32 +0000
519+++ lib/lp/code/model/branchmergeproposaljob.py 2010-10-26 15:55:46 +0000
520@@ -9,9 +9,6 @@
521 """
522
523
524-from __future__ import with_statement
525-
526-
527 __metaclass__ = type
528
529
530
531=== modified file 'lib/lp/code/model/directbranchcommit.py'
532--- lib/lp/code/model/directbranchcommit.py 2010-10-06 11:46:51 +0000
533+++ lib/lp/code/model/directbranchcommit.py 2010-10-26 15:55:46 +0000
534@@ -3,8 +3,6 @@
535
536 """Commit files straight to bzr branch."""
537
538-from __future__ import with_statement
539-
540 __metaclass__ = type
541 __all__ = [
542 'ConcurrentUpdateError',
543
544=== modified file 'lib/lp/code/model/tests/test_branch.py'
545--- lib/lp/code/model/tests/test_branch.py 2010-10-04 19:50:45 +0000
546+++ lib/lp/code/model/tests/test_branch.py 2010-10-26 15:55:46 +0000
547@@ -6,8 +6,6 @@
548 """Tests for Branches."""
549
550
551-from __future__ import with_statement
552-
553 __metaclass__ = type
554
555 from datetime import (
556
557=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
558--- lib/lp/code/model/tests/test_branchjob.py 2010-10-07 22:46:08 +0000
559+++ lib/lp/code/model/tests/test_branchjob.py 2010-10-26 15:55:46 +0000
560@@ -3,8 +3,6 @@
561
562 """Tests for BranchJobs."""
563
564-from __future__ import with_statement
565-
566 __metaclass__ = type
567
568 import datetime
569
570=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
571--- lib/lp/code/model/tests/test_branchmergeproposal.py 2010-10-19 00:44:24 +0000
572+++ lib/lp/code/model/tests/test_branchmergeproposal.py 2010-10-26 15:55:46 +0000
573@@ -3,8 +3,6 @@
574
575 # pylint: disable-msg=F0401
576
577-from __future__ import with_statement
578-
579 """Tests for BranchMergeProposals."""
580
581 __metaclass__ = type
582
583=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
584--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py 2010-10-20 01:17:42 +0000
585+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py 2010-10-26 15:55:46 +0000
586@@ -3,8 +3,6 @@
587
588 """Tests for branch merge proposal jobs."""
589
590-from __future__ import with_statement
591-
592 __metaclass__ = type
593
594 from datetime import (
595
596=== modified file 'lib/lp/code/model/tests/test_branchsubscription.py'
597--- lib/lp/code/model/tests/test_branchsubscription.py 2010-08-20 20:31:18 +0000
598+++ lib/lp/code/model/tests/test_branchsubscription.py 2010-10-26 15:55:46 +0000
599@@ -3,8 +3,6 @@
600
601 """Tests for the BranchSubscrptions model object.."""
602
603-from __future__ import with_statement
604-
605 __metaclass__ = type
606
607 import unittest
608
609=== modified file 'lib/lp/code/model/tests/test_diff.py'
610--- lib/lp/code/model/tests/test_diff.py 2010-10-04 19:50:45 +0000
611+++ lib/lp/code/model/tests/test_diff.py 2010-10-26 15:55:46 +0000
612@@ -3,8 +3,6 @@
613
614 """Tests for Diff, etc."""
615
616-from __future__ import with_statement
617-
618 __metaclass__ = type
619
620
621
622=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
623--- lib/lp/code/model/tests/test_recipebuilder.py 2010-10-04 19:50:45 +0000
624+++ lib/lp/code/model/tests/test_recipebuilder.py 2010-10-26 15:55:46 +0000
625@@ -3,8 +3,6 @@
626
627 """Test RecipeBuildBehavior."""
628
629-from __future__ import with_statement
630-
631 # pylint: disable-msg=F0401
632
633 __metaclass__ = type
634
635=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
636--- lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-09-22 21:03:48 +0000
637+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-10-26 15:55:46 +0000
638@@ -3,8 +3,6 @@
639
640 """Tests for the SourcePackageRecipe content type."""
641
642-from __future__ import with_statement
643-
644 __metaclass__ = type
645
646 from datetime import (
647
648=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
649--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-10-06 11:46:51 +0000
650+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-10-26 15:55:46 +0000
651@@ -3,8 +3,6 @@
652
653 """Tests for source package builds."""
654
655-from __future__ import with_statement
656-
657 __metaclass__ = type
658
659 import datetime
660
661=== modified file 'lib/lp/code/scripts/tests/test_scan_branches.py'
662--- lib/lp/code/scripts/tests/test_scan_branches.py 2010-10-04 19:50:45 +0000
663+++ lib/lp/code/scripts/tests/test_scan_branches.py 2010-10-26 15:55:46 +0000
664@@ -6,8 +6,6 @@
665 """Test the scan_branches script."""
666
667
668-from __future__ import with_statement
669-
670 from storm.locals import Store
671 import transaction
672
673
674=== modified file 'lib/lp/code/scripts/tests/test_sendbranchmail.py'
675--- lib/lp/code/scripts/tests/test_sendbranchmail.py 2010-10-04 19:50:45 +0000
676+++ lib/lp/code/scripts/tests/test_sendbranchmail.py 2010-10-26 15:55:46 +0000
677@@ -5,8 +5,6 @@
678
679 """Test the sendbranchmail script"""
680
681-from __future__ import with_statement
682-
683 import unittest
684
685 import transaction
686
687=== modified file 'lib/lp/code/xmlrpc/tests/test_branch.py'
688--- lib/lp/code/xmlrpc/tests/test_branch.py 2010-10-04 19:50:45 +0000
689+++ lib/lp/code/xmlrpc/tests/test_branch.py 2010-10-26 15:55:46 +0000
690@@ -3,8 +3,6 @@
691
692 """Unit tests for the public codehosting API."""
693
694-from __future__ import with_statement
695-
696 __metaclass__ = type
697 __all__ = []
698
699
700=== modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
701--- lib/lp/codehosting/codeimport/tests/servers.py 2010-09-02 12:09:05 +0000
702+++ lib/lp/codehosting/codeimport/tests/servers.py 2010-10-26 15:55:46 +0000
703@@ -3,8 +3,6 @@
704
705 """Server classes that know how to create various kinds of foreign archive."""
706
707-from __future__ import with_statement
708-
709 __all__ = [
710 'CVSServer',
711 'GitServer',
712
713=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
714--- lib/lp/codehosting/scanner/tests/test_buglinks.py 2010-10-21 04:19:36 +0000
715+++ lib/lp/codehosting/scanner/tests/test_buglinks.py 2010-10-26 15:55:46 +0000
716@@ -3,8 +3,6 @@
717
718 """Tests for creating BugBranch items based on Bazaar revisions."""
719
720-from __future__ import with_statement
721-
722 __metaclass__ = type
723
724 import unittest
725
726=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
727--- lib/lp/codehosting/scanner/tests/test_bzrsync.py 2010-10-15 18:33:07 +0000
728+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py 2010-10-26 15:55:46 +0000
729@@ -5,8 +5,6 @@
730
731 # pylint: disable-msg=W0141
732
733-from __future__ import with_statement
734-
735 import datetime
736 import os
737 import random
738
739=== modified file 'lib/lp/codehosting/scanner/tests/test_mergedetection.py'
740--- lib/lp/codehosting/scanner/tests/test_mergedetection.py 2010-10-21 04:19:36 +0000
741+++ lib/lp/codehosting/scanner/tests/test_mergedetection.py 2010-10-26 15:55:46 +0000
742@@ -3,8 +3,6 @@
743
744 """Tests for the scanner's merge detection."""
745
746-from __future__ import with_statement
747-
748 __metaclass__ = type
749
750 import logging
751
752=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
753--- lib/lp/codehosting/tests/test_branchdistro.py 2010-09-29 02:20:44 +0000
754+++ lib/lp/codehosting/tests/test_branchdistro.py 2010-10-26 15:55:46 +0000
755@@ -4,8 +4,6 @@
756 """Tests for making new source package branches just after a distro release.
757 """
758
759-from __future__ import with_statement
760-
761 __metaclass__ = type
762
763 import os
764
765=== modified file 'lib/lp/codehosting/tests/test_jobs.py'
766--- lib/lp/codehosting/tests/test_jobs.py 2010-10-04 19:50:45 +0000
767+++ lib/lp/codehosting/tests/test_jobs.py 2010-10-26 15:55:46 +0000
768@@ -3,8 +3,6 @@
769
770 """Tests for Job-running facilities."""
771
772-from __future__ import with_statement
773-
774 from unittest import TestLoader
775
776 from canonical.config import config
777
778=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
779--- lib/lp/codehosting/tests/test_sftp.py 2010-08-20 20:31:18 +0000
780+++ lib/lp/codehosting/tests/test_sftp.py 2010-10-26 15:55:46 +0000
781@@ -3,7 +3,6 @@
782
783 """Tests for the transport-backed SFTP server implementation."""
784
785-from __future__ import with_statement
786 from contextlib import closing
787 import os
788 import unittest
789
790=== modified file 'lib/lp/registry/browser/tests/test_distroseriesdifference_views.py'
791--- lib/lp/registry/browser/tests/test_distroseriesdifference_views.py 2010-09-28 08:30:16 +0000
792+++ lib/lp/registry/browser/tests/test_distroseriesdifference_views.py 2010-10-26 15:55:46 +0000
793@@ -3,8 +3,6 @@
794
795 """Unit tests for the DistroSeriesDifference views."""
796
797-from __future__ import with_statement
798-
799 __metaclass__ = type
800
801 from BeautifulSoup import BeautifulSoup
802
803=== modified file 'lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py'
804--- lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py 2010-09-29 09:53:15 +0000
805+++ lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py 2010-10-26 15:55:46 +0000
806@@ -1,8 +1,6 @@
807 # Copyright 2010 Canonical Ltd. This software is licensed under the
808 # GNU Affero General Public License version 3 (see the file LICENSE).
809
810-from __future__ import with_statement
811-
812 __metaclass__ = type
813
814 import transaction
815
816=== modified file 'lib/lp/registry/browser/tests/test_mailinglists.py'
817--- lib/lp/registry/browser/tests/test_mailinglists.py 2010-08-20 20:31:18 +0000
818+++ lib/lp/registry/browser/tests/test_mailinglists.py 2010-10-26 15:55:46 +0000
819@@ -2,8 +2,6 @@
820 # Copyright 2010 Canonical Ltd. This software is licensed under the
821 # GNU Affero General Public License version 3 (see the file LICENSE).
822
823-from __future__ import with_statement
824-
825 """Test harness for mailinglist views unit tests."""
826
827 __metaclass__ = type
828
829=== modified file 'lib/lp/registry/browser/tests/test_milestone.py'
830--- lib/lp/registry/browser/tests/test_milestone.py 2010-09-16 04:43:45 +0000
831+++ lib/lp/registry/browser/tests/test_milestone.py 2010-10-26 15:55:46 +0000
832@@ -1,8 +1,6 @@
833 # Copyright 2010 Canonical Ltd. This software is licensed under the
834 # GNU Affero General Public License version 3 (see the file LICENSE).
835
836-from __future__ import with_statement
837-
838 """Test milestone views."""
839
840 __metaclass__ = type
841
842=== modified file 'lib/lp/registry/browser/tests/test_peoplemerge.py'
843--- lib/lp/registry/browser/tests/test_peoplemerge.py 2010-10-04 19:50:45 +0000
844+++ lib/lp/registry/browser/tests/test_peoplemerge.py 2010-10-26 15:55:46 +0000
845@@ -2,8 +2,6 @@
846 # GNU Affero General Public License version 3 (see the file LICENSE).
847 """Test the peoplemerge browser module."""
848
849-from __future__ import with_statement
850-
851 __metaclass__ = type
852
853 from zope.component import getUtility
854
855=== modified file 'lib/lp/registry/browser/tests/test_series_views.py'
856--- lib/lp/registry/browser/tests/test_series_views.py 2010-10-06 18:53:53 +0000
857+++ lib/lp/registry/browser/tests/test_series_views.py 2010-10-26 15:55:46 +0000
858@@ -1,8 +1,6 @@
859 # Copyright 2010 Canonical Ltd. This software is licensed under the
860 # GNU Affero General Public License version 3 (see the file LICENSE).
861
862-from __future__ import with_statement
863-
864 __metaclass__ = type
865
866 from BeautifulSoup import BeautifulSoup
867
868=== modified file 'lib/lp/registry/model/person.py'
869--- lib/lp/registry/model/person.py 2010-10-26 02:02:12 +0000
870+++ lib/lp/registry/model/person.py 2010-10-26 15:55:46 +0000
871@@ -1,7 +1,5 @@
872 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
873 # GNU Affero General Public License version 3 (see the file LICENSE).
874-from __future__ import with_statement
875-
876 # vars() causes W0612
877 # pylint: disable-msg=E0611,W0212,W0612,C0322
878
879
880=== modified file 'lib/lp/registry/tests/test_add_member.py'
881--- lib/lp/registry/tests/test_add_member.py 2010-10-04 19:50:45 +0000
882+++ lib/lp/registry/tests/test_add_member.py 2010-10-26 15:55:46 +0000
883@@ -3,8 +3,6 @@
884
885 """Test team membership changes."""
886
887-from __future__ import with_statement
888-
889 __metaclass__ = type
890
891 from canonical.testing.layers import DatabaseFunctionalLayer
892
893=== modified file 'lib/lp/registry/tests/test_distroseries.py'
894--- lib/lp/registry/tests/test_distroseries.py 2010-10-04 20:46:55 +0000
895+++ lib/lp/registry/tests/test_distroseries.py 2010-10-26 15:55:46 +0000
896@@ -3,8 +3,6 @@
897
898 """Tests for distroseries."""
899
900-from __future__ import with_statement
901-
902 __metaclass__ = type
903
904 import transaction
905
906=== modified file 'lib/lp/registry/tests/test_distroseriesdifference.py'
907--- lib/lp/registry/tests/test_distroseriesdifference.py 2010-10-24 12:37:51 +0000
908+++ lib/lp/registry/tests/test_distroseriesdifference.py 2010-10-26 15:55:46 +0000
909@@ -3,8 +3,6 @@
910
911 """Model tests for the DistroSeriesDifference class."""
912
913-from __future__ import with_statement
914-
915 __metaclass__ = type
916
917 import unittest
918
919=== modified file 'lib/lp/registry/tests/test_mailinglist.py'
920--- lib/lp/registry/tests/test_mailinglist.py 2010-10-04 19:50:45 +0000
921+++ lib/lp/registry/tests/test_mailinglist.py 2010-10-26 15:55:46 +0000
922@@ -1,8 +1,6 @@
923 # Copyright 2009 Canonical Ltd. This software is licensed under the
924 # GNU Affero General Public License version 3 (see the file LICENSE).
925
926-from __future__ import with_statement
927-
928 __metaclass__ = type
929 __all__ = []
930
931
932=== modified file 'lib/lp/registry/tests/test_mailinglistapi.py'
933--- lib/lp/registry/tests/test_mailinglistapi.py 2010-10-04 19:50:45 +0000
934+++ lib/lp/registry/tests/test_mailinglistapi.py 2010-10-26 15:55:46 +0000
935@@ -3,8 +3,6 @@
936
937 """Unit tests for the private MailingList API."""
938
939-from __future__ import with_statement
940-
941 __metaclass__ = type
942 __all__ = []
943
944
945=== modified file 'lib/lp/registry/tests/test_person.py'
946--- lib/lp/registry/tests/test_person.py 2010-09-29 14:16:22 +0000
947+++ lib/lp/registry/tests/test_person.py 2010-10-26 15:55:46 +0000
948@@ -1,8 +1,6 @@
949 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
950 # GNU Affero General Public License version 3 (see the file LICENSE).
951
952-from __future__ import with_statement
953-
954 __metaclass__ = type
955
956 from datetime import datetime
957
958=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
959--- lib/lp/registry/tests/test_sourcepackage.py 2010-08-24 15:29:01 +0000
960+++ lib/lp/registry/tests/test_sourcepackage.py 2010-10-26 15:55:46 +0000
961@@ -3,8 +3,6 @@
962
963 """Unit tests for ISourcePackage implementations."""
964
965-from __future__ import with_statement
966-
967 __metaclass__ = type
968
969 import unittest
970
971=== modified file 'lib/lp/services/features/tests/test_db_settings.py'
972--- lib/lp/services/features/tests/test_db_settings.py 2010-08-20 20:31:18 +0000
973+++ lib/lp/services/features/tests/test_db_settings.py 2010-10-26 15:55:46 +0000
974@@ -4,7 +4,6 @@
975 """Tests for feature settings coming from the database"""
976
977
978-from __future__ import with_statement
979 __metaclass__ = type
980
981 from canonical.testing import layers
982
983=== modified file 'lib/lp/services/features/tests/test_flags.py'
984--- lib/lp/services/features/tests/test_flags.py 2010-09-28 09:29:46 +0000
985+++ lib/lp/services/features/tests/test_flags.py 2010-10-26 15:55:46 +0000
986@@ -4,7 +4,6 @@
987 """Tests for feature flags."""
988
989
990-from __future__ import with_statement
991 __metaclass__ = type
992
993 import os
994
995=== modified file 'lib/lp/services/job/runner.py'
996--- lib/lp/services/job/runner.py 2010-10-07 16:51:23 +0000
997+++ lib/lp/services/job/runner.py 2010-10-26 15:55:46 +0000
998@@ -4,7 +4,6 @@
999 """Facilities for running Jobs."""
1000
1001
1002-from __future__ import with_statement
1003 __metaclass__ = type
1004
1005
1006
1007=== modified file 'lib/lp/services/job/tests/test_runner.py'
1008--- lib/lp/services/job/tests/test_runner.py 2010-10-06 18:53:53 +0000
1009+++ lib/lp/services/job/tests/test_runner.py 2010-10-26 15:55:46 +0000
1010@@ -4,8 +4,6 @@
1011 """Tests for job-running facilities."""
1012
1013
1014-from __future__ import with_statement
1015-
1016 import sys
1017 from time import sleep
1018 from unittest import TestLoader
1019
1020=== modified file 'lib/lp/services/log/tests/test_uniquefileallocator.py'
1021--- lib/lp/services/log/tests/test_uniquefileallocator.py 2010-10-13 16:35:06 +0000
1022+++ lib/lp/services/log/tests/test_uniquefileallocator.py 2010-10-26 15:55:46 +0000
1023@@ -3,7 +3,6 @@
1024
1025 """Tests for the unique log naming facility."""
1026
1027-from __future__ import with_statement
1028 __metaclass__ = type
1029
1030 import datetime
1031
1032=== modified file 'lib/lp/services/mailman/tests/test_lpmoderate.py'
1033--- lib/lp/services/mailman/tests/test_lpmoderate.py 2010-10-06 11:46:51 +0000
1034+++ lib/lp/services/mailman/tests/test_lpmoderate.py 2010-10-26 15:55:46 +0000
1035@@ -2,8 +2,6 @@
1036 # GNU Affero General Public License version 3 (see the file LICENSE).
1037 """Test the lpmoderate monekypatches"""
1038
1039-from __future__ import with_statement
1040-
1041 __metaclass__ = type
1042 __all__ = []
1043
1044
1045=== modified file 'lib/lp/services/spriteutils.py'
1046--- lib/lp/services/spriteutils.py 2010-08-20 20:31:18 +0000
1047+++ lib/lp/services/spriteutils.py 2010-10-26 15:55:46 +0000
1048@@ -6,8 +6,6 @@
1049
1050 """Library to create sprites."""
1051
1052-from __future__ import with_statement
1053-
1054 __metaclass__ = type
1055
1056 __all__ = [
1057
1058=== modified file 'lib/lp/services/utils.py'
1059--- lib/lp/services/utils.py 2010-08-20 20:31:18 +0000
1060+++ lib/lp/services/utils.py 2010-10-26 15:55:46 +0000
1061@@ -1,8 +1,6 @@
1062 # Copyright 2009 Canonical Ltd. This software is licensed under the
1063 # GNU Affero General Public License version 3 (see the file LICENSE).
1064
1065-from __future__ import with_statement
1066-
1067 """Generic Python utilities.
1068
1069 Functions, lists and so forth. Nothing here that does system calls or network
1070
1071=== modified file 'lib/lp/soyuz/browser/tests/test_archive_webservice.py'
1072--- lib/lp/soyuz/browser/tests/test_archive_webservice.py 2010-10-04 19:50:45 +0000
1073+++ lib/lp/soyuz/browser/tests/test_archive_webservice.py 2010-10-26 15:55:46 +0000
1074@@ -1,8 +1,6 @@
1075 # Copyright 2010 Canonical Ltd. This software is licensed under the
1076 # GNU Affero General Public License version 3 (see the file LICENSE).
1077
1078-from __future__ import with_statement
1079-
1080 __metaclass__ = type
1081
1082 import unittest
1083
1084=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
1085--- lib/lp/soyuz/scripts/tests/test_queue.py 2010-10-04 20:46:55 +0000
1086+++ lib/lp/soyuz/scripts/tests/test_queue.py 2010-10-26 15:55:46 +0000
1087@@ -3,8 +3,6 @@
1088
1089 """queue tool base class tests."""
1090
1091-from __future__ import with_statement
1092-
1093 __metaclass__ = type
1094 __all__ = [
1095 'upload_bar_source',
1096
1097=== modified file 'lib/lp/soyuz/tests/test_archive.py'
1098--- lib/lp/soyuz/tests/test_archive.py 2010-10-04 19:50:45 +0000
1099+++ lib/lp/soyuz/tests/test_archive.py 2010-10-26 15:55:46 +0000
1100@@ -1,8 +1,6 @@
1101 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1102 # GNU Affero General Public License version 3 (see the file LICENSE).
1103
1104-from __future__ import with_statement
1105-
1106 """Test Archive features."""
1107
1108 from datetime import date
1109
1110=== modified file 'lib/lp/soyuz/tests/test_archive_subscriptions.py'
1111--- lib/lp/soyuz/tests/test_archive_subscriptions.py 2010-10-04 19:50:45 +0000
1112+++ lib/lp/soyuz/tests/test_archive_subscriptions.py 2010-10-26 15:55:46 +0000
1113@@ -3,8 +3,6 @@
1114
1115 """Test Archive features."""
1116
1117-from __future__ import with_statement
1118-
1119 from zope.security.interfaces import Unauthorized
1120
1121 from canonical.testing.layers import DatabaseFunctionalLayer
1122
1123=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py'
1124--- lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py 2010-10-04 19:50:45 +0000
1125+++ lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py 2010-10-26 15:55:46 +0000
1126@@ -1,8 +1,6 @@
1127 # Copyright 2010 Canonical Ltd. This software is licensed under the
1128 # GNU Affero General Public License version 3 (see the file LICENSE).
1129
1130-from __future__ import with_statement
1131-
1132 """Tests for BinaryPackageBuildBehavior."""
1133
1134 __metaclass__ = type
1135
1136=== modified file 'lib/lp/soyuz/tests/test_copyarchivejob.py'
1137--- lib/lp/soyuz/tests/test_copyarchivejob.py 2010-10-04 19:50:45 +0000
1138+++ lib/lp/soyuz/tests/test_copyarchivejob.py 2010-10-26 15:55:46 +0000
1139@@ -1,8 +1,6 @@
1140 # Copyright 2009 Canonical Ltd. This software is licensed under the
1141 # GNU Affero General Public License version 3 (see the file LICENSE).
1142
1143-from __future__ import with_statement
1144-
1145 __metaclass__ = type
1146
1147 from zope.component import getUtility
1148
1149=== modified file 'lib/lp/testing/__init__.py'
1150--- lib/lp/testing/__init__.py 2010-10-25 13:16:10 +0000
1151+++ lib/lp/testing/__init__.py 2010-10-26 15:55:46 +0000
1152@@ -3,9 +3,6 @@
1153
1154 # pylint: disable-msg=W0401,C0301,F0401
1155
1156-from __future__ import with_statement
1157-
1158-
1159 __metaclass__ = type
1160 __all__ = [
1161 'ANONYMOUS',
1162
1163=== modified file 'lib/lp/testing/_login.py'
1164--- lib/lp/testing/_login.py 2010-08-20 20:31:18 +0000
1165+++ lib/lp/testing/_login.py 2010-10-26 15:55:46 +0000
1166@@ -1,8 +1,6 @@
1167 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1168 # GNU Affero General Public License version 3 (see the file LICENSE).
1169
1170-from __future__ import with_statement
1171-
1172 # We like global statements!
1173 # pylint: disable-msg=W0602,W0603
1174 __metaclass__ = type
1175
1176=== modified file 'lib/lp/testing/factory.py'
1177--- lib/lp/testing/factory.py 2010-10-24 13:02:07 +0000
1178+++ lib/lp/testing/factory.py 2010-10-26 15:55:46 +0000
1179@@ -3,8 +3,6 @@
1180
1181 # pylint: disable-msg=F0401
1182
1183-from __future__ import with_statement
1184-
1185 """Testing infrastructure for the Launchpad application.
1186
1187 This module should not contain tests (but it should be tested).
1188
1189=== modified file 'lib/lp/testing/tests/test_login.py'
1190--- lib/lp/testing/tests/test_login.py 2010-08-20 20:31:18 +0000
1191+++ lib/lp/testing/tests/test_login.py 2010-10-26 15:55:46 +0000
1192@@ -1,8 +1,6 @@
1193 # Copyright 2010 Canonical Ltd. This software is licensed under the
1194 # GNU Affero General Public License version 3 (see the file LICENSE).
1195
1196-from __future__ import with_statement
1197-
1198 """Tests for the login helpers."""
1199
1200 __metaclass__ = type
1201
1202=== modified file 'lib/lp/testing/tests/test_testing.py'
1203--- lib/lp/testing/tests/test_testing.py 2010-09-29 20:36:26 +0000
1204+++ lib/lp/testing/tests/test_testing.py 2010-10-26 15:55:46 +0000
1205@@ -1,8 +1,6 @@
1206 # Copyright 2010 Canonical Ltd. This software is licensed under the
1207 # GNU Affero General Public License version 3 (see the file LICENSE).
1208
1209-from __future__ import with_statement
1210-
1211 """Tests for the testing module."""
1212
1213 __metaclass__ = type
1214
1215=== modified file 'lib/lp/translations/pottery/detect_intltool.py'
1216--- lib/lp/translations/pottery/detect_intltool.py 2010-08-20 20:31:18 +0000
1217+++ lib/lp/translations/pottery/detect_intltool.py 2010-10-26 15:55:46 +0000
1218@@ -4,8 +4,6 @@
1219 """Functions to detect if intltool can be used to generate a POT file for the
1220 package in the current directory."""
1221
1222-from __future__ import with_statement
1223-
1224 from contextlib import contextmanager
1225
1226
1227
1228=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
1229--- lib/lp/translations/tests/test_autoapproval.py 2010-10-04 19:50:45 +0000
1230+++ lib/lp/translations/tests/test_autoapproval.py 2010-10-26 15:55:46 +0000
1231@@ -8,8 +8,6 @@
1232 through the possibilities should go here.
1233 """
1234
1235-from __future__ import with_statement
1236-
1237 from contextlib import contextmanager
1238 from datetime import (
1239 datetime,
1240
1241=== modified file 'lib/lp/translations/tests/test_pottery_detect_intltool.py'
1242--- lib/lp/translations/tests/test_pottery_detect_intltool.py 2010-08-20 20:31:18 +0000
1243+++ lib/lp/translations/tests/test_pottery_detect_intltool.py 2010-10-26 15:55:46 +0000
1244@@ -1,8 +1,6 @@
1245 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1246 # GNU Affero General Public License version 3 (see the file LICENSE).
1247
1248-from __future__ import with_statement
1249-
1250 import os
1251 from StringIO import StringIO
1252 import tarfile
1253
1254=== modified file 'lib/lp/translations/tests/test_rosetta_branches_script.py'
1255--- lib/lp/translations/tests/test_rosetta_branches_script.py 2010-10-04 19:50:45 +0000
1256+++ lib/lp/translations/tests/test_rosetta_branches_script.py 2010-10-26 15:55:46 +0000
1257@@ -7,8 +7,6 @@
1258 provisions to handle Bazaar branches.
1259 """
1260
1261-from __future__ import with_statement
1262-
1263 __metaclass__ = type
1264
1265 from unittest import TestLoader
1266
1267=== modified file 'lib/lp/translations/tests/test_translationimportqueue.py'
1268--- lib/lp/translations/tests/test_translationimportqueue.py 2010-10-04 19:50:45 +0000
1269+++ lib/lp/translations/tests/test_translationimportqueue.py 2010-10-26 15:55:46 +0000
1270@@ -1,8 +1,6 @@
1271 # Copyright 2009-2010 Canonical Ltd. This software is licensed under the
1272 # GNU Affero General Public License version 3 (see the file LICENSE).
1273
1274-from __future__ import with_statement
1275-
1276 __metaclass__ = type
1277
1278 import unittest