Merge lp:~allenap/launchpad/remove-with-statement into lp:launchpad
- remove-with-statement
- 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 |
Related bugs: |
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.
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 | 3 | 3 | ||
6 | 4 | """Functions to build PO templates on the build slave.""" | 4 | """Functions to build PO templates on the build slave.""" |
7 | 5 | 5 | ||
8 | 6 | from __future__ import with_statement | ||
9 | 7 | |||
10 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
11 | 9 | __all__ = [ | 7 | __all__ = [ |
12 | 10 | 'check_potfiles_in', | 8 | 'check_potfiles_in', |
13 | 11 | 9 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
19 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
20 | 3 | 3 | ||
21 | 4 | from __future__ import with_statement | ||
22 | 5 | """Fixtures related to configs. | 4 | """Fixtures related to configs. |
23 | 6 | 5 | ||
24 | 7 | XXX: Robert Collins 2010-10-20 bug=663454 this is in the wrong namespace. | 6 | XXX: Robert Collins 2010-10-20 bug=663454 this is in the wrong namespace. |
25 | 8 | 7 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
31 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
32 | 3 | 3 | ||
33 | 4 | from __future__ import with_statement | ||
34 | 5 | |||
35 | 6 | """Test harness for TAC (Twisted Application Configuration) files.""" | 4 | """Test harness for TAC (Twisted Application Configuration) files.""" |
36 | 7 | 5 | ||
37 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
38 | 9 | 7 | ||
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 | 7 | """ | 7 | """ |
44 | 8 | # pylint: disable-msg=C0103 | 8 | # pylint: disable-msg=C0103 |
45 | 9 | 9 | ||
46 | 10 | from __future__ import with_statement | ||
47 | 11 | |||
48 | 12 | import logging | 10 | import logging |
49 | 13 | import os | 11 | import os |
50 | 14 | import unittest | 12 | import unittest |
51 | @@ -358,8 +356,6 @@ | |||
52 | 358 | one_test = LayeredDocFileSuite( | 356 | one_test = LayeredDocFileSuite( |
53 | 359 | path, setUp=setUp, tearDown=tearDown, | 357 | path, setUp=setUp, tearDown=tearDown, |
54 | 360 | layer=LaunchpadFunctionalLayer, | 358 | layer=LaunchpadFunctionalLayer, |
55 | 361 | # 'icky way of running doctests with __future__ imports | ||
56 | 362 | globs={'with_statement': with_statement}, | ||
57 | 363 | stdout_logging_level=logging.WARNING) | 359 | stdout_logging_level=logging.WARNING) |
58 | 364 | suite.addTest(one_test) | 360 | suite.addTest(one_test) |
59 | 365 | 361 | ||
60 | 366 | 362 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
66 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
67 | 3 | 3 | ||
68 | 4 | from __future__ import with_statement | ||
69 | 5 | |||
70 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
71 | 7 | 5 | ||
72 | 8 | from doctest import DocTestSuite | 6 | from doctest import DocTestSuite |
73 | 9 | 7 | ||
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 | 7 | named read-only.txt in the root of the Launchpad tree. | 7 | named read-only.txt in the root of the Launchpad tree. |
79 | 8 | """ | 8 | """ |
80 | 9 | 9 | ||
81 | 10 | from __future__ import with_statement | ||
82 | 11 | |||
83 | 12 | __metaclass__ = type | 10 | __metaclass__ = type |
84 | 13 | __all__ = [ | 11 | __all__ = [ |
85 | 14 | 'is_read_only', | 12 | 'is_read_only', |
86 | 15 | 13 | ||
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 | 3 | 3 | ||
92 | 4 | """Module docstring goes here.""" | 4 | """Module docstring goes here.""" |
93 | 5 | 5 | ||
94 | 6 | from __future__ import with_statement | ||
95 | 7 | |||
96 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
97 | 9 | 7 | ||
98 | 10 | __all__ = [ | 8 | __all__ = [ |
99 | 11 | 9 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
105 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
106 | 3 | 3 | ||
107 | 4 | from __future__ import with_statement | ||
108 | 5 | |||
109 | 6 | """Testing infrastructure for page tests.""" | 4 | """Testing infrastructure for page tests.""" |
110 | 7 | 5 | ||
111 | 8 | # Stop lint warning about not initializing TestCase parent on | 6 | # Stop lint warning about not initializing TestCase parent on |
112 | @@ -813,7 +811,6 @@ | |||
113 | 813 | test.globs['print_tag_with_id'] = print_tag_with_id | 811 | test.globs['print_tag_with_id'] = print_tag_with_id |
114 | 814 | test.globs['PageTestLayer'] = PageTestLayer | 812 | test.globs['PageTestLayer'] = PageTestLayer |
115 | 815 | test.globs['stop'] = stop | 813 | test.globs['stop'] = stop |
116 | 816 | test.globs['with_statement'] = with_statement | ||
117 | 817 | test.globs['ws_uncache'] = ws_uncache | 814 | test.globs['ws_uncache'] = ws_uncache |
118 | 818 | 815 | ||
119 | 819 | 816 | ||
120 | 820 | 817 | ||
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 | 3 | 3 | ||
126 | 4 | """Infrastructure for setting up doctests.""" | 4 | """Infrastructure for setting up doctests.""" |
127 | 5 | 5 | ||
128 | 6 | from __future__ import with_statement | ||
129 | 7 | |||
130 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
131 | 9 | __all__ = [ | 7 | __all__ = [ |
132 | 10 | 'default_optionflags', | 8 | 'default_optionflags', |
133 | @@ -211,7 +209,6 @@ | |||
134 | 211 | test.globs['verifyObject'] = verifyObject | 209 | test.globs['verifyObject'] = verifyObject |
135 | 212 | test.globs['pretty'] = pprint.PrettyPrinter(width=1).pformat | 210 | test.globs['pretty'] = pprint.PrettyPrinter(width=1).pformat |
136 | 213 | test.globs['stop'] = stop | 211 | test.globs['stop'] = stop |
137 | 214 | test.globs['with_statement'] = with_statement | ||
138 | 215 | test.globs['launchpadlib_for'] = launchpadlib_for | 212 | test.globs['launchpadlib_for'] = launchpadlib_for |
139 | 216 | test.globs['launchpadlib_credentials_for'] = launchpadlib_credentials_for | 213 | test.globs['launchpadlib_credentials_for'] = launchpadlib_credentials_for |
140 | 217 | test.globs['oauth_access_token_for'] = oauth_access_token_for | 214 | test.globs['oauth_access_token_for'] = oauth_access_token_for |
141 | 218 | 215 | ||
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 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
147 | 3 | """Stuff to do with logging in and logging out.""" | 3 | """Stuff to do with logging in and logging out.""" |
148 | 4 | 4 | ||
149 | 5 | from __future__ import with_statement | ||
150 | 6 | |||
151 | 7 | __metaclass__ = type | 5 | __metaclass__ = type |
152 | 8 | 6 | ||
153 | 9 | from datetime import ( | 7 | from datetime import ( |
154 | 10 | 8 | ||
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 | 3 | 3 | ||
160 | 4 | """Tests for error logging & OOPS reporting.""" | 4 | """Tests for error logging & OOPS reporting.""" |
161 | 5 | 5 | ||
162 | 6 | from __future__ import with_statement | ||
163 | 7 | __metaclass__ = type | 6 | __metaclass__ = type |
164 | 8 | 7 | ||
165 | 9 | import datetime | 8 | import datetime |
166 | 10 | 9 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. All rights reserved. | 1 | # Copyright 2009-2010 Canonical Ltd. All rights reserved. |
172 | 2 | from __future__ import with_statement | ||
173 | 3 | |||
174 | 4 | # pylint: disable-msg=W0105 | 2 | # pylint: disable-msg=W0105 |
175 | 5 | """Test harness for running the new-login.txt tests.""" | 3 | """Test harness for running the new-login.txt tests.""" |
176 | 6 | 4 | ||
177 | 7 | 5 | ||
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 | 3 | 3 | ||
183 | 4 | """Tests for the Windmill test doubles themselves.""" | 4 | """Tests for the Windmill test doubles themselves.""" |
184 | 5 | 5 | ||
185 | 6 | from __future__ import with_statement | ||
186 | 7 | |||
187 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
188 | 9 | 7 | ||
189 | 10 | from mocker import ( | 8 | from mocker import ( |
190 | 11 | 9 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
196 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
197 | 3 | 3 | ||
198 | 4 | from __future__ import with_statement | ||
199 | 5 | |||
200 | 6 | """Parallel test glue.""" | 4 | """Parallel test glue.""" |
201 | 7 | 5 | ||
202 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
203 | 9 | 7 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
209 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
210 | 3 | 3 | ||
211 | 4 | from __future__ import with_statement | ||
212 | 5 | |||
213 | 6 | """Parallel test glue.""" | 4 | """Parallel test glue.""" |
214 | 7 | 5 | ||
215 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
216 | 9 | 7 | ||
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 | 3 | 3 | ||
222 | 4 | """The entry point for the 'ec2' utility.""" | 4 | """The entry point for the 'ec2' utility.""" |
223 | 5 | 5 | ||
224 | 6 | from __future__ import with_statement | ||
225 | 7 | |||
226 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
227 | 9 | __all__ = [ | 7 | __all__ = [ |
228 | 10 | 'main', | 8 | 'main', |
229 | 11 | 9 | ||
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 | 16 | the responsibility of handling the results that `LaunchpadTester` gathers. | 16 | the responsibility of handling the results that `LaunchpadTester` gathers. |
235 | 17 | """ | 17 | """ |
236 | 18 | 18 | ||
237 | 19 | from __future__ import with_statement | ||
238 | 20 | |||
239 | 21 | __metatype__ = type | 19 | __metatype__ = type |
240 | 22 | 20 | ||
241 | 23 | import datetime | 21 | import datetime |
242 | 24 | 22 | ||
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 | 3 | 3 | ||
248 | 4 | """Test questiontarget views.""" | 4 | """Test questiontarget views.""" |
249 | 5 | 5 | ||
250 | 6 | from __future__ import with_statement | ||
251 | 7 | |||
252 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
253 | 9 | 7 | ||
254 | 10 | import os | 8 | import os |
255 | 11 | 9 | ||
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 | 3 | 3 | ||
261 | 4 | """Tests for the archive uploader.""" | 4 | """Tests for the archive uploader.""" |
262 | 5 | 5 | ||
263 | 6 | from __future__ import with_statement | ||
264 | 7 | |||
265 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
266 | 9 | 7 | ||
267 | 10 | __all__ = [ | 8 | __all__ = [ |
268 | 11 | 9 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
274 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
275 | 3 | 3 | ||
276 | 4 | from __future__ import with_statement | ||
277 | 5 | |||
278 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
279 | 7 | 5 | ||
280 | 8 | 6 | ||
281 | 9 | 7 | ||
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 | 3 | 3 | ||
287 | 4 | """Tests for BugTracker views.""" | 4 | """Tests for BugTracker views.""" |
288 | 5 | 5 | ||
289 | 6 | from __future__ import with_statement | ||
290 | 7 | |||
291 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
292 | 9 | 7 | ||
293 | 10 | from zope.component import getUtility | 8 | from zope.component import getUtility |
294 | 11 | 9 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
300 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
301 | 3 | 3 | ||
302 | 4 | from __future__ import with_statement | ||
303 | 5 | |||
304 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
305 | 7 | 5 | ||
306 | 8 | from canonical.testing.layers import DatabaseFunctionalLayer | 6 | from canonical.testing.layers import DatabaseFunctionalLayer |
307 | 9 | 7 | ||
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 | 3 | 3 | ||
313 | 4 | """Common classes and functions for the checkwatches system.""" | 4 | """Common classes and functions for the checkwatches system.""" |
314 | 5 | 5 | ||
315 | 6 | from __future__ import with_statement | ||
316 | 7 | |||
317 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
318 | 9 | __all__ = [ | 7 | __all__ = [ |
319 | 10 | 'WorkingBase', | 8 | 'WorkingBase', |
320 | 11 | 9 | ||
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 | 3 | 3 | ||
326 | 4 | """Classes and logic for the checkwatches BugWatchUpdater.""" | 4 | """Classes and logic for the checkwatches BugWatchUpdater.""" |
327 | 5 | 5 | ||
328 | 6 | from __future__ import with_statement | ||
329 | 7 | |||
330 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
331 | 9 | __all__ = [ | 7 | __all__ = [ |
332 | 10 | 'BugWatchUpdater', | 8 | 'BugWatchUpdater', |
333 | 11 | 9 | ||
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 | 3 | 3 | ||
339 | 4 | """Classes and logic for the checkwatches cronscript.""" | 4 | """Classes and logic for the checkwatches cronscript.""" |
340 | 5 | 5 | ||
341 | 6 | from __future__ import with_statement | ||
342 | 7 | |||
343 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
344 | 9 | __all__ = [ | 7 | __all__ = [ |
345 | 10 | 'BaseScheduler', | 8 | 'BaseScheduler', |
346 | 11 | 9 | ||
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 | 3 | 3 | ||
352 | 4 | """Classes and logic for the remote bug updater.""" | 4 | """Classes and logic for the remote bug updater.""" |
353 | 5 | 5 | ||
354 | 6 | from __future__ import with_statement | ||
355 | 7 | |||
356 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
357 | 9 | __all__ = [ | 7 | __all__ = [ |
358 | 10 | 'RemoteBugUpdater', | 8 | 'RemoteBugUpdater', |
359 | 11 | 9 | ||
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 | 3 | 3 | ||
365 | 4 | """Tests for the `base` module.""" | 4 | """Tests for the `base` module.""" |
366 | 5 | 5 | ||
367 | 6 | from __future__ import with_statement | ||
368 | 7 | |||
369 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
370 | 9 | 7 | ||
371 | 10 | from contextlib import contextmanager | 8 | from contextlib import contextmanager |
372 | 11 | 9 | ||
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 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
378 | 3 | """Checkwatches unit tests.""" | 3 | """Checkwatches unit tests.""" |
379 | 4 | 4 | ||
380 | 5 | from __future__ import with_statement | ||
381 | 6 | |||
382 | 7 | __metaclass__ = type | 5 | __metaclass__ = type |
383 | 8 | 6 | ||
384 | 9 | from datetime import datetime | 7 | from datetime import datetime |
385 | 10 | 8 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
391 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
392 | 3 | 3 | ||
393 | 4 | from __future__ import with_statement | ||
394 | 5 | |||
395 | 6 | """Tests for bug-branch linking from the bugs side.""" | 4 | """Tests for bug-branch linking from the bugs side.""" |
396 | 7 | 5 | ||
397 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
398 | 9 | 7 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
404 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
405 | 3 | 3 | ||
406 | 4 | from __future__ import with_statement | ||
407 | 5 | |||
408 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
409 | 7 | __all__ = [ | 5 | __all__ = [ |
410 | 8 | 'PackageBuild', | 6 | 'PackageBuild', |
411 | 9 | 7 | ||
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 | 3 | 3 | ||
417 | 4 | """Tests for `IPackageBuild`.""" | 4 | """Tests for `IPackageBuild`.""" |
418 | 5 | 5 | ||
419 | 6 | from __future__ import with_statement | ||
420 | 7 | |||
421 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
422 | 9 | 7 | ||
423 | 10 | from datetime import datetime | 8 | from datetime import datetime |
424 | 11 | 9 | ||
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 | 3 | 3 | ||
430 | 4 | """Unit tests for BranchView.""" | 4 | """Unit tests for BranchView.""" |
431 | 5 | 5 | ||
432 | 6 | from __future__ import with_statement | ||
433 | 7 | |||
434 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
435 | 9 | 7 | ||
436 | 10 | from datetime import ( | 8 | from datetime import ( |
437 | 11 | 9 | ||
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 | 3 | 3 | ||
443 | 4 | """Tests for branch listing.""" | 4 | """Tests for branch listing.""" |
444 | 5 | 5 | ||
445 | 6 | from __future__ import with_statement | ||
446 | 7 | |||
447 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
448 | 9 | 7 | ||
449 | 10 | from datetime import timedelta | 8 | from datetime import timedelta |
450 | 11 | 9 | ||
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 | 3 | 3 | ||
456 | 4 | """Unit tests for CodeReviewComments.""" | 4 | """Unit tests for CodeReviewComments.""" |
457 | 5 | 5 | ||
458 | 6 | from __future__ import with_statement | ||
459 | 7 | |||
460 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
461 | 9 | 7 | ||
462 | 10 | import unittest | 8 | import unittest |
463 | 11 | 9 | ||
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 | 3 | 3 | ||
469 | 4 | """Unit tests for CodeReviewVoteReferences.""" | 4 | """Unit tests for CodeReviewVoteReferences.""" |
470 | 5 | 5 | ||
471 | 6 | from __future__ import with_statement | ||
472 | 7 | |||
473 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
474 | 9 | 7 | ||
475 | 10 | 8 | ||
476 | 11 | 9 | ||
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 | 4 | 4 | ||
482 | 5 | """Tests for the source package recipe view classes and templates.""" | 5 | """Tests for the source package recipe view classes and templates.""" |
483 | 6 | 6 | ||
484 | 7 | from __future__ import with_statement | ||
485 | 8 | |||
486 | 9 | __metaclass__ = type | 7 | __metaclass__ = type |
487 | 10 | 8 | ||
488 | 11 | 9 | ||
489 | 12 | 10 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
495 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
496 | 3 | 3 | ||
497 | 4 | from __future__ import with_statement | ||
498 | 5 | |||
499 | 6 | |||
500 | 7 | __metaclass__ = type | 4 | __metaclass__ = type |
501 | 8 | 5 | ||
502 | 9 | 6 | ||
503 | 10 | 7 | ||
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 | 3 | 3 | ||
509 | 4 | """Testing the CodeHandler.""" | 4 | """Testing the CodeHandler.""" |
510 | 5 | 5 | ||
511 | 6 | from __future__ import with_statement | ||
512 | 7 | |||
513 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
514 | 9 | 7 | ||
515 | 10 | from difflib import unified_diff | 8 | from difflib import unified_diff |
516 | 11 | 9 | ||
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 | 9 | """ | 9 | """ |
522 | 10 | 10 | ||
523 | 11 | 11 | ||
524 | 12 | from __future__ import with_statement | ||
525 | 13 | |||
526 | 14 | |||
527 | 15 | __metaclass__ = type | 12 | __metaclass__ = type |
528 | 16 | 13 | ||
529 | 17 | 14 | ||
530 | 18 | 15 | ||
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 | 3 | 3 | ||
536 | 4 | """Commit files straight to bzr branch.""" | 4 | """Commit files straight to bzr branch.""" |
537 | 5 | 5 | ||
538 | 6 | from __future__ import with_statement | ||
539 | 7 | |||
540 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
541 | 9 | __all__ = [ | 7 | __all__ = [ |
542 | 10 | 'ConcurrentUpdateError', | 8 | 'ConcurrentUpdateError', |
543 | 11 | 9 | ||
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 | 6 | """Tests for Branches.""" | 6 | """Tests for Branches.""" |
549 | 7 | 7 | ||
550 | 8 | 8 | ||
551 | 9 | from __future__ import with_statement | ||
552 | 10 | |||
553 | 11 | __metaclass__ = type | 9 | __metaclass__ = type |
554 | 12 | 10 | ||
555 | 13 | from datetime import ( | 11 | from datetime import ( |
556 | 14 | 12 | ||
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 | 3 | 3 | ||
562 | 4 | """Tests for BranchJobs.""" | 4 | """Tests for BranchJobs.""" |
563 | 5 | 5 | ||
564 | 6 | from __future__ import with_statement | ||
565 | 7 | |||
566 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
567 | 9 | 7 | ||
568 | 10 | import datetime | 8 | import datetime |
569 | 11 | 9 | ||
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 | 3 | 3 | ||
575 | 4 | # pylint: disable-msg=F0401 | 4 | # pylint: disable-msg=F0401 |
576 | 5 | 5 | ||
577 | 6 | from __future__ import with_statement | ||
578 | 7 | |||
579 | 8 | """Tests for BranchMergeProposals.""" | 6 | """Tests for BranchMergeProposals.""" |
580 | 9 | 7 | ||
581 | 10 | __metaclass__ = type | 8 | __metaclass__ = type |
582 | 11 | 9 | ||
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 | 3 | 3 | ||
588 | 4 | """Tests for branch merge proposal jobs.""" | 4 | """Tests for branch merge proposal jobs.""" |
589 | 5 | 5 | ||
590 | 6 | from __future__ import with_statement | ||
591 | 7 | |||
592 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
593 | 9 | 7 | ||
594 | 10 | from datetime import ( | 8 | from datetime import ( |
595 | 11 | 9 | ||
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 | 3 | 3 | ||
601 | 4 | """Tests for the BranchSubscrptions model object..""" | 4 | """Tests for the BranchSubscrptions model object..""" |
602 | 5 | 5 | ||
603 | 6 | from __future__ import with_statement | ||
604 | 7 | |||
605 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
606 | 9 | 7 | ||
607 | 10 | import unittest | 8 | import unittest |
608 | 11 | 9 | ||
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 | 3 | 3 | ||
614 | 4 | """Tests for Diff, etc.""" | 4 | """Tests for Diff, etc.""" |
615 | 5 | 5 | ||
616 | 6 | from __future__ import with_statement | ||
617 | 7 | |||
618 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
619 | 9 | 7 | ||
620 | 10 | 8 | ||
621 | 11 | 9 | ||
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 | 3 | 3 | ||
627 | 4 | """Test RecipeBuildBehavior.""" | 4 | """Test RecipeBuildBehavior.""" |
628 | 5 | 5 | ||
629 | 6 | from __future__ import with_statement | ||
630 | 7 | |||
631 | 8 | # pylint: disable-msg=F0401 | 6 | # pylint: disable-msg=F0401 |
632 | 9 | 7 | ||
633 | 10 | __metaclass__ = type | 8 | __metaclass__ = type |
634 | 11 | 9 | ||
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 | 3 | 3 | ||
640 | 4 | """Tests for the SourcePackageRecipe content type.""" | 4 | """Tests for the SourcePackageRecipe content type.""" |
641 | 5 | 5 | ||
642 | 6 | from __future__ import with_statement | ||
643 | 7 | |||
644 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
645 | 9 | 7 | ||
646 | 10 | from datetime import ( | 8 | from datetime import ( |
647 | 11 | 9 | ||
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 | 3 | 3 | ||
653 | 4 | """Tests for source package builds.""" | 4 | """Tests for source package builds.""" |
654 | 5 | 5 | ||
655 | 6 | from __future__ import with_statement | ||
656 | 7 | |||
657 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
658 | 9 | 7 | ||
659 | 10 | import datetime | 8 | import datetime |
660 | 11 | 9 | ||
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 | 6 | """Test the scan_branches script.""" | 6 | """Test the scan_branches script.""" |
666 | 7 | 7 | ||
667 | 8 | 8 | ||
668 | 9 | from __future__ import with_statement | ||
669 | 10 | |||
670 | 11 | from storm.locals import Store | 9 | from storm.locals import Store |
671 | 12 | import transaction | 10 | import transaction |
672 | 13 | 11 | ||
673 | 14 | 12 | ||
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 | 5 | 5 | ||
679 | 6 | """Test the sendbranchmail script""" | 6 | """Test the sendbranchmail script""" |
680 | 7 | 7 | ||
681 | 8 | from __future__ import with_statement | ||
682 | 9 | |||
683 | 10 | import unittest | 8 | import unittest |
684 | 11 | 9 | ||
685 | 12 | import transaction | 10 | import transaction |
686 | 13 | 11 | ||
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 | 3 | 3 | ||
692 | 4 | """Unit tests for the public codehosting API.""" | 4 | """Unit tests for the public codehosting API.""" |
693 | 5 | 5 | ||
694 | 6 | from __future__ import with_statement | ||
695 | 7 | |||
696 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
697 | 9 | __all__ = [] | 7 | __all__ = [] |
698 | 10 | 8 | ||
699 | 11 | 9 | ||
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 | 3 | 3 | ||
705 | 4 | """Server classes that know how to create various kinds of foreign archive.""" | 4 | """Server classes that know how to create various kinds of foreign archive.""" |
706 | 5 | 5 | ||
707 | 6 | from __future__ import with_statement | ||
708 | 7 | |||
709 | 8 | __all__ = [ | 6 | __all__ = [ |
710 | 9 | 'CVSServer', | 7 | 'CVSServer', |
711 | 10 | 'GitServer', | 8 | 'GitServer', |
712 | 11 | 9 | ||
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 | 3 | 3 | ||
718 | 4 | """Tests for creating BugBranch items based on Bazaar revisions.""" | 4 | """Tests for creating BugBranch items based on Bazaar revisions.""" |
719 | 5 | 5 | ||
720 | 6 | from __future__ import with_statement | ||
721 | 7 | |||
722 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
723 | 9 | 7 | ||
724 | 10 | import unittest | 8 | import unittest |
725 | 11 | 9 | ||
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 | 5 | 5 | ||
731 | 6 | # pylint: disable-msg=W0141 | 6 | # pylint: disable-msg=W0141 |
732 | 7 | 7 | ||
733 | 8 | from __future__ import with_statement | ||
734 | 9 | |||
735 | 10 | import datetime | 8 | import datetime |
736 | 11 | import os | 9 | import os |
737 | 12 | import random | 10 | import random |
738 | 13 | 11 | ||
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 | 3 | 3 | ||
744 | 4 | """Tests for the scanner's merge detection.""" | 4 | """Tests for the scanner's merge detection.""" |
745 | 5 | 5 | ||
746 | 6 | from __future__ import with_statement | ||
747 | 7 | |||
748 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
749 | 9 | 7 | ||
750 | 10 | import logging | 8 | import logging |
751 | 11 | 9 | ||
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 | 4 | """Tests for making new source package branches just after a distro release. | 4 | """Tests for making new source package branches just after a distro release. |
757 | 5 | """ | 5 | """ |
758 | 6 | 6 | ||
759 | 7 | from __future__ import with_statement | ||
760 | 8 | |||
761 | 9 | __metaclass__ = type | 7 | __metaclass__ = type |
762 | 10 | 8 | ||
763 | 11 | import os | 9 | import os |
764 | 12 | 10 | ||
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 | 3 | 3 | ||
770 | 4 | """Tests for Job-running facilities.""" | 4 | """Tests for Job-running facilities.""" |
771 | 5 | 5 | ||
772 | 6 | from __future__ import with_statement | ||
773 | 7 | |||
774 | 8 | from unittest import TestLoader | 6 | from unittest import TestLoader |
775 | 9 | 7 | ||
776 | 10 | from canonical.config import config | 8 | from canonical.config import config |
777 | 11 | 9 | ||
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 | 3 | 3 | ||
783 | 4 | """Tests for the transport-backed SFTP server implementation.""" | 4 | """Tests for the transport-backed SFTP server implementation.""" |
784 | 5 | 5 | ||
785 | 6 | from __future__ import with_statement | ||
786 | 7 | from contextlib import closing | 6 | from contextlib import closing |
787 | 8 | import os | 7 | import os |
788 | 9 | import unittest | 8 | import unittest |
789 | 10 | 9 | ||
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 | 3 | 3 | ||
795 | 4 | """Unit tests for the DistroSeriesDifference views.""" | 4 | """Unit tests for the DistroSeriesDifference views.""" |
796 | 5 | 5 | ||
797 | 6 | from __future__ import with_statement | ||
798 | 7 | |||
799 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
800 | 9 | 7 | ||
801 | 10 | from BeautifulSoup import BeautifulSoup | 8 | from BeautifulSoup import BeautifulSoup |
802 | 11 | 9 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
808 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
809 | 3 | 3 | ||
810 | 4 | from __future__ import with_statement | ||
811 | 5 | |||
812 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
813 | 7 | 5 | ||
814 | 8 | import transaction | 6 | import transaction |
815 | 9 | 7 | ||
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 | 2 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 2 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
821 | 3 | # GNU Affero General Public License version 3 (see the file LICENSE). | 3 | # GNU Affero General Public License version 3 (see the file LICENSE). |
822 | 4 | 4 | ||
823 | 5 | from __future__ import with_statement | ||
824 | 6 | |||
825 | 7 | """Test harness for mailinglist views unit tests.""" | 5 | """Test harness for mailinglist views unit tests.""" |
826 | 8 | 6 | ||
827 | 9 | __metaclass__ = type | 7 | __metaclass__ = type |
828 | 10 | 8 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
834 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
835 | 3 | 3 | ||
836 | 4 | from __future__ import with_statement | ||
837 | 5 | |||
838 | 6 | """Test milestone views.""" | 4 | """Test milestone views.""" |
839 | 7 | 5 | ||
840 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
841 | 9 | 7 | ||
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 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
847 | 3 | """Test the peoplemerge browser module.""" | 3 | """Test the peoplemerge browser module.""" |
848 | 4 | 4 | ||
849 | 5 | from __future__ import with_statement | ||
850 | 6 | |||
851 | 7 | __metaclass__ = type | 5 | __metaclass__ = type |
852 | 8 | 6 | ||
853 | 9 | from zope.component import getUtility | 7 | from zope.component import getUtility |
854 | 10 | 8 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
860 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
861 | 3 | 3 | ||
862 | 4 | from __future__ import with_statement | ||
863 | 5 | |||
864 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
865 | 7 | 5 | ||
866 | 8 | from BeautifulSoup import BeautifulSoup | 6 | from BeautifulSoup import BeautifulSoup |
867 | 9 | 7 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
873 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
874 | 3 | from __future__ import with_statement | ||
875 | 4 | |||
876 | 5 | # vars() causes W0612 | 3 | # vars() causes W0612 |
877 | 6 | # pylint: disable-msg=E0611,W0212,W0612,C0322 | 4 | # pylint: disable-msg=E0611,W0212,W0612,C0322 |
878 | 7 | 5 | ||
879 | 8 | 6 | ||
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 | 3 | 3 | ||
885 | 4 | """Test team membership changes.""" | 4 | """Test team membership changes.""" |
886 | 5 | 5 | ||
887 | 6 | from __future__ import with_statement | ||
888 | 7 | |||
889 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
890 | 9 | 7 | ||
891 | 10 | from canonical.testing.layers import DatabaseFunctionalLayer | 8 | from canonical.testing.layers import DatabaseFunctionalLayer |
892 | 11 | 9 | ||
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 | 3 | 3 | ||
898 | 4 | """Tests for distroseries.""" | 4 | """Tests for distroseries.""" |
899 | 5 | 5 | ||
900 | 6 | from __future__ import with_statement | ||
901 | 7 | |||
902 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
903 | 9 | 7 | ||
904 | 10 | import transaction | 8 | import transaction |
905 | 11 | 9 | ||
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 | 3 | 3 | ||
911 | 4 | """Model tests for the DistroSeriesDifference class.""" | 4 | """Model tests for the DistroSeriesDifference class.""" |
912 | 5 | 5 | ||
913 | 6 | from __future__ import with_statement | ||
914 | 7 | |||
915 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
916 | 9 | 7 | ||
917 | 10 | import unittest | 8 | import unittest |
918 | 11 | 9 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
924 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
925 | 3 | 3 | ||
926 | 4 | from __future__ import with_statement | ||
927 | 5 | |||
928 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
929 | 7 | __all__ = [] | 5 | __all__ = [] |
930 | 8 | 6 | ||
931 | 9 | 7 | ||
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 | 3 | 3 | ||
937 | 4 | """Unit tests for the private MailingList API.""" | 4 | """Unit tests for the private MailingList API.""" |
938 | 5 | 5 | ||
939 | 6 | from __future__ import with_statement | ||
940 | 7 | |||
941 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
942 | 9 | __all__ = [] | 7 | __all__ = [] |
943 | 10 | 8 | ||
944 | 11 | 9 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
950 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
951 | 3 | 3 | ||
952 | 4 | from __future__ import with_statement | ||
953 | 5 | |||
954 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
955 | 7 | 5 | ||
956 | 8 | from datetime import datetime | 6 | from datetime import datetime |
957 | 9 | 7 | ||
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 | 3 | 3 | ||
963 | 4 | """Unit tests for ISourcePackage implementations.""" | 4 | """Unit tests for ISourcePackage implementations.""" |
964 | 5 | 5 | ||
965 | 6 | from __future__ import with_statement | ||
966 | 7 | |||
967 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
968 | 9 | 7 | ||
969 | 10 | import unittest | 8 | import unittest |
970 | 11 | 9 | ||
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 | 4 | """Tests for feature settings coming from the database""" | 4 | """Tests for feature settings coming from the database""" |
976 | 5 | 5 | ||
977 | 6 | 6 | ||
978 | 7 | from __future__ import with_statement | ||
979 | 8 | __metaclass__ = type | 7 | __metaclass__ = type |
980 | 9 | 8 | ||
981 | 10 | from canonical.testing import layers | 9 | from canonical.testing import layers |
982 | 11 | 10 | ||
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 | 4 | """Tests for feature flags.""" | 4 | """Tests for feature flags.""" |
988 | 5 | 5 | ||
989 | 6 | 6 | ||
990 | 7 | from __future__ import with_statement | ||
991 | 8 | __metaclass__ = type | 7 | __metaclass__ = type |
992 | 9 | 8 | ||
993 | 10 | import os | 9 | import os |
994 | 11 | 10 | ||
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 | 4 | """Facilities for running Jobs.""" | 4 | """Facilities for running Jobs.""" |
1000 | 5 | 5 | ||
1001 | 6 | 6 | ||
1002 | 7 | from __future__ import with_statement | ||
1003 | 8 | __metaclass__ = type | 7 | __metaclass__ = type |
1004 | 9 | 8 | ||
1005 | 10 | 9 | ||
1006 | 11 | 10 | ||
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 | 4 | """Tests for job-running facilities.""" | 4 | """Tests for job-running facilities.""" |
1012 | 5 | 5 | ||
1013 | 6 | 6 | ||
1014 | 7 | from __future__ import with_statement | ||
1015 | 8 | |||
1016 | 9 | import sys | 7 | import sys |
1017 | 10 | from time import sleep | 8 | from time import sleep |
1018 | 11 | from unittest import TestLoader | 9 | from unittest import TestLoader |
1019 | 12 | 10 | ||
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 | 3 | 3 | ||
1025 | 4 | """Tests for the unique log naming facility.""" | 4 | """Tests for the unique log naming facility.""" |
1026 | 5 | 5 | ||
1027 | 6 | from __future__ import with_statement | ||
1028 | 7 | __metaclass__ = type | 6 | __metaclass__ = type |
1029 | 8 | 7 | ||
1030 | 9 | import datetime | 8 | import datetime |
1031 | 10 | 9 | ||
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 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1037 | 3 | """Test the lpmoderate monekypatches""" | 3 | """Test the lpmoderate monekypatches""" |
1038 | 4 | 4 | ||
1039 | 5 | from __future__ import with_statement | ||
1040 | 6 | |||
1041 | 7 | __metaclass__ = type | 5 | __metaclass__ = type |
1042 | 8 | __all__ = [] | 6 | __all__ = [] |
1043 | 9 | 7 | ||
1044 | 10 | 8 | ||
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 | 6 | 6 | ||
1050 | 7 | """Library to create sprites.""" | 7 | """Library to create sprites.""" |
1051 | 8 | 8 | ||
1052 | 9 | from __future__ import with_statement | ||
1053 | 10 | |||
1054 | 11 | __metaclass__ = type | 9 | __metaclass__ = type |
1055 | 12 | 10 | ||
1056 | 13 | __all__ = [ | 11 | __all__ = [ |
1057 | 14 | 12 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
1063 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1064 | 3 | 3 | ||
1065 | 4 | from __future__ import with_statement | ||
1066 | 5 | |||
1067 | 6 | """Generic Python utilities. | 4 | """Generic Python utilities. |
1068 | 7 | 5 | ||
1069 | 8 | Functions, lists and so forth. Nothing here that does system calls or network | 6 | Functions, lists and so forth. Nothing here that does system calls or network |
1070 | 9 | 7 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
1076 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1077 | 3 | 3 | ||
1078 | 4 | from __future__ import with_statement | ||
1079 | 5 | |||
1080 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
1081 | 7 | 5 | ||
1082 | 8 | import unittest | 6 | import unittest |
1083 | 9 | 7 | ||
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 | 3 | 3 | ||
1089 | 4 | """queue tool base class tests.""" | 4 | """queue tool base class tests.""" |
1090 | 5 | 5 | ||
1091 | 6 | from __future__ import with_statement | ||
1092 | 7 | |||
1093 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
1094 | 9 | __all__ = [ | 7 | __all__ = [ |
1095 | 10 | 'upload_bar_source', | 8 | 'upload_bar_source', |
1096 | 11 | 9 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
1102 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1103 | 3 | 3 | ||
1104 | 4 | from __future__ import with_statement | ||
1105 | 5 | |||
1106 | 6 | """Test Archive features.""" | 4 | """Test Archive features.""" |
1107 | 7 | 5 | ||
1108 | 8 | from datetime import date | 6 | from datetime import date |
1109 | 9 | 7 | ||
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 | 3 | 3 | ||
1115 | 4 | """Test Archive features.""" | 4 | """Test Archive features.""" |
1116 | 5 | 5 | ||
1117 | 6 | from __future__ import with_statement | ||
1118 | 7 | |||
1119 | 8 | from zope.security.interfaces import Unauthorized | 6 | from zope.security.interfaces import Unauthorized |
1120 | 9 | 7 | ||
1121 | 10 | from canonical.testing.layers import DatabaseFunctionalLayer | 8 | from canonical.testing.layers import DatabaseFunctionalLayer |
1122 | 11 | 9 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
1128 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1129 | 3 | 3 | ||
1130 | 4 | from __future__ import with_statement | ||
1131 | 5 | |||
1132 | 6 | """Tests for BinaryPackageBuildBehavior.""" | 4 | """Tests for BinaryPackageBuildBehavior.""" |
1133 | 7 | 5 | ||
1134 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
1135 | 9 | 7 | ||
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 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the |
1141 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1142 | 3 | 3 | ||
1143 | 4 | from __future__ import with_statement | ||
1144 | 5 | |||
1145 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
1146 | 7 | 5 | ||
1147 | 8 | from zope.component import getUtility | 6 | from zope.component import getUtility |
1148 | 9 | 7 | ||
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 | 3 | 3 | ||
1154 | 4 | # pylint: disable-msg=W0401,C0301,F0401 | 4 | # pylint: disable-msg=W0401,C0301,F0401 |
1155 | 5 | 5 | ||
1156 | 6 | from __future__ import with_statement | ||
1157 | 7 | |||
1158 | 8 | |||
1159 | 9 | __metaclass__ = type | 6 | __metaclass__ = type |
1160 | 10 | __all__ = [ | 7 | __all__ = [ |
1161 | 11 | 'ANONYMOUS', | 8 | 'ANONYMOUS', |
1162 | 12 | 9 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
1168 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1169 | 3 | 3 | ||
1170 | 4 | from __future__ import with_statement | ||
1171 | 5 | |||
1172 | 6 | # We like global statements! | 4 | # We like global statements! |
1173 | 7 | # pylint: disable-msg=W0602,W0603 | 5 | # pylint: disable-msg=W0602,W0603 |
1174 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
1175 | 9 | 7 | ||
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 | 3 | 3 | ||
1181 | 4 | # pylint: disable-msg=F0401 | 4 | # pylint: disable-msg=F0401 |
1182 | 5 | 5 | ||
1183 | 6 | from __future__ import with_statement | ||
1184 | 7 | |||
1185 | 8 | """Testing infrastructure for the Launchpad application. | 6 | """Testing infrastructure for the Launchpad application. |
1186 | 9 | 7 | ||
1187 | 10 | This module should not contain tests (but it should be tested). | 8 | This module should not contain tests (but it should be tested). |
1188 | 11 | 9 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
1194 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1195 | 3 | 3 | ||
1196 | 4 | from __future__ import with_statement | ||
1197 | 5 | |||
1198 | 6 | """Tests for the login helpers.""" | 4 | """Tests for the login helpers.""" |
1199 | 7 | 5 | ||
1200 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
1201 | 9 | 7 | ||
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 | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2010 Canonical Ltd. This software is licensed under the |
1207 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1208 | 3 | 3 | ||
1209 | 4 | from __future__ import with_statement | ||
1210 | 5 | |||
1211 | 6 | """Tests for the testing module.""" | 4 | """Tests for the testing module.""" |
1212 | 7 | 5 | ||
1213 | 8 | __metaclass__ = type | 6 | __metaclass__ = type |
1214 | 9 | 7 | ||
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 | 4 | """Functions to detect if intltool can be used to generate a POT file for the | 4 | """Functions to detect if intltool can be used to generate a POT file for the |
1220 | 5 | package in the current directory.""" | 5 | package in the current directory.""" |
1221 | 6 | 6 | ||
1222 | 7 | from __future__ import with_statement | ||
1223 | 8 | |||
1224 | 9 | from contextlib import contextmanager | 7 | from contextlib import contextmanager |
1225 | 10 | 8 | ||
1226 | 11 | 9 | ||
1227 | 12 | 10 | ||
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 | 8 | through the possibilities should go here. | 8 | through the possibilities should go here. |
1233 | 9 | """ | 9 | """ |
1234 | 10 | 10 | ||
1235 | 11 | from __future__ import with_statement | ||
1236 | 12 | |||
1237 | 13 | from contextlib import contextmanager | 11 | from contextlib import contextmanager |
1238 | 14 | from datetime import ( | 12 | from datetime import ( |
1239 | 15 | datetime, | 13 | datetime, |
1240 | 16 | 14 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
1246 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1247 | 3 | 3 | ||
1248 | 4 | from __future__ import with_statement | ||
1249 | 5 | |||
1250 | 6 | import os | 4 | import os |
1251 | 7 | from StringIO import StringIO | 5 | from StringIO import StringIO |
1252 | 8 | import tarfile | 6 | import tarfile |
1253 | 9 | 7 | ||
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 | 7 | provisions to handle Bazaar branches. | 7 | provisions to handle Bazaar branches. |
1259 | 8 | """ | 8 | """ |
1260 | 9 | 9 | ||
1261 | 10 | from __future__ import with_statement | ||
1262 | 11 | |||
1263 | 12 | __metaclass__ = type | 10 | __metaclass__ = type |
1264 | 13 | 11 | ||
1265 | 14 | from unittest import TestLoader | 12 | from unittest import TestLoader |
1266 | 15 | 13 | ||
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 | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
1272 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
1273 | 3 | 3 | ||
1274 | 4 | from __future__ import with_statement | ||
1275 | 5 | |||
1276 | 6 | __metaclass__ = type | 4 | __metaclass__ = type |
1277 | 7 | 5 | ||
1278 | 8 | import unittest | 6 | import unittest |
Woot! Thanks.