launchpad-reviewers team mailing list archive

Thread
Date

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

To: mp+39381@xxxxxxxxxxxxxxxxxx
From: Gavin Panella <gavin.panella@xxxxxxxxxxxxx>
Date: Tue, 26 Oct 2010 15:55:00 -0000
Reply-to: mp+39381@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Gavin Panella has proposed merging lp:~allenap/launchpad/remove-with-statement into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


Now we're officially on Python 2.6, remove all the with_statement stuff from the tree.
-- 
https://code.launchpad.net/~allenap/launchpad/remove-with-statement/+merge/39381
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/launchpad/remove-with-statement into lp:launchpad/devel.

=== modified file 'lib/canonical/buildd/pottery/intltool.py'
--- lib/canonical/buildd/pottery/intltool.py	2010-06-30 15:46:36 +0000
+++ lib/canonical/buildd/pottery/intltool.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Functions to build PO templates on the build slave."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'check_potfiles_in',

=== modified file 'lib/canonical/config/fixture.py'
--- lib/canonical/config/fixture.py	2010-10-19 19:23:19 +0000
+++ lib/canonical/config/fixture.py	2010-10-26 15:54:49 +0000
@@ -1,7 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
 """Fixtures related to configs.
 
 XXX: Robert Collins 2010-10-20 bug=663454 this is in the wrong namespace.

=== modified file 'lib/canonical/launchpad/daemons/tachandler.py'
--- lib/canonical/launchpad/daemons/tachandler.py	2010-10-20 18:43:29 +0000
+++ lib/canonical/launchpad/daemons/tachandler.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Test harness for TAC (Twisted Application Configuration) files."""
 
 __metaclass__ = type

=== modified file 'lib/canonical/launchpad/ftests/test_system_documentation.py'
--- lib/canonical/launchpad/ftests/test_system_documentation.py	2010-10-20 20:51:26 +0000
+++ lib/canonical/launchpad/ftests/test_system_documentation.py	2010-10-26 15:54:49 +0000
@@ -7,8 +7,6 @@
 """
 # pylint: disable-msg=C0103
 
-from __future__ import with_statement
-
 import logging
 import os
 import unittest
@@ -358,8 +356,6 @@
         one_test = LayeredDocFileSuite(
             path, setUp=setUp, tearDown=tearDown,
             layer=LaunchpadFunctionalLayer,
-            # 'icky way of running doctests with __future__ imports
-            globs={'with_statement': with_statement},
             stdout_logging_level=logging.WARNING)
         suite.addTest(one_test)
 

=== modified file 'lib/canonical/launchpad/mail/tests/test_handlers.py'
--- lib/canonical/launchpad/mail/tests/test_handlers.py	2010-10-12 01:11:41 +0000
+++ lib/canonical/launchpad/mail/tests/test_handlers.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from doctest import DocTestSuite

=== modified file 'lib/canonical/launchpad/readonly.py'
--- lib/canonical/launchpad/readonly.py	2010-08-20 20:31:18 +0000
+++ lib/canonical/launchpad/readonly.py	2010-10-26 15:54:49 +0000
@@ -7,8 +7,6 @@
 named read-only.txt in the root of the Launchpad tree.
 """
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'is_read_only',

=== modified file 'lib/canonical/launchpad/scripts/oops.py'
--- lib/canonical/launchpad/scripts/oops.py	2010-09-09 06:04:24 +0000
+++ lib/canonical/launchpad/scripts/oops.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Module docstring goes here."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 __all__ = [

=== modified file 'lib/canonical/launchpad/testing/pages.py'
--- lib/canonical/launchpad/testing/pages.py	2010-10-12 05:32:24 +0000
+++ lib/canonical/launchpad/testing/pages.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Testing infrastructure for page tests."""
 
 # Stop lint warning about not initializing TestCase parent on
@@ -813,7 +811,6 @@
     test.globs['print_tag_with_id'] = print_tag_with_id
     test.globs['PageTestLayer'] = PageTestLayer
     test.globs['stop'] = stop
-    test.globs['with_statement'] = with_statement
     test.globs['ws_uncache'] = ws_uncache
 
 

=== modified file 'lib/canonical/launchpad/testing/systemdocs.py'
--- lib/canonical/launchpad/testing/systemdocs.py	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/testing/systemdocs.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Infrastructure for setting up doctests."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'default_optionflags',
@@ -211,7 +209,6 @@
     test.globs['verifyObject'] = verifyObject
     test.globs['pretty'] = pprint.PrettyPrinter(width=1).pformat
     test.globs['stop'] = stop
-    test.globs['with_statement'] = with_statement
     test.globs['launchpadlib_for'] = launchpadlib_for
     test.globs['launchpadlib_credentials_for'] = launchpadlib_credentials_for
     test.globs['oauth_access_token_for'] = oauth_access_token_for

=== modified file 'lib/canonical/launchpad/webapp/login.py'
--- lib/canonical/launchpad/webapp/login.py	2010-09-03 16:43:11 +0000
+++ lib/canonical/launchpad/webapp/login.py	2010-10-26 15:54:49 +0000
@@ -2,8 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 """Stuff to do with logging in and logging out."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import (

=== modified file 'lib/canonical/launchpad/webapp/tests/test_errorlog.py'
--- lib/canonical/launchpad/webapp/tests/test_errorlog.py	2010-10-13 16:44:44 +0000
+++ lib/canonical/launchpad/webapp/tests/test_errorlog.py	2010-10-26 15:54:49 +0000
@@ -3,7 +3,6 @@
 
 """Tests for error logging & OOPS reporting."""
 
-from __future__ import with_statement
 __metaclass__ = type
 
 import datetime

=== modified file 'lib/canonical/launchpad/webapp/tests/test_login.py'
--- lib/canonical/launchpad/webapp/tests/test_login.py	2010-09-03 11:10:09 +0000
+++ lib/canonical/launchpad/webapp/tests/test_login.py	2010-10-26 15:54:49 +0000
@@ -1,6 +1,4 @@
 # Copyright 2009-2010 Canonical Ltd.  All rights reserved.
-from __future__ import with_statement
-
 # pylint: disable-msg=W0105
 """Test harness for running the new-login.txt tests."""
 

=== modified file 'lib/canonical/launchpad/windmill/tests/test_widgets.py'
--- lib/canonical/launchpad/windmill/tests/test_widgets.py	2010-08-20 20:31:18 +0000
+++ lib/canonical/launchpad/windmill/tests/test_widgets.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for the Windmill test doubles themselves."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from mocker import (

=== modified file 'lib/canonical/testing/parallel.py'
--- lib/canonical/testing/parallel.py	2010-10-16 18:20:17 +0000
+++ lib/canonical/testing/parallel.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Parallel test glue."""
 
 __metaclass__ = type

=== modified file 'lib/canonical/testing/tests/test_parallel.py'
--- lib/canonical/testing/tests/test_parallel.py	2010-10-16 18:20:17 +0000
+++ lib/canonical/testing/tests/test_parallel.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Parallel test glue."""
 
 __metaclass__ = type

=== modified file 'lib/devscripts/ec2test/entrypoint.py'
--- lib/devscripts/ec2test/entrypoint.py	2010-08-26 04:33:36 +0000
+++ lib/devscripts/ec2test/entrypoint.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """The entry point for the 'ec2' utility."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'main',

=== modified file 'lib/devscripts/ec2test/remote.py'
--- lib/devscripts/ec2test/remote.py	2010-09-20 22:44:49 +0000
+++ lib/devscripts/ec2test/remote.py	2010-10-26 15:54:49 +0000
@@ -16,8 +16,6 @@
    the responsibility of handling the results that `LaunchpadTester` gathers.
 """
 
-from __future__ import with_statement
-
 __metatype__ = type
 
 import datetime

=== modified file 'lib/lp/answers/browser/tests/test_questiontarget.py'
--- lib/lp/answers/browser/tests/test_questiontarget.py	2010-10-04 19:50:45 +0000
+++ lib/lp/answers/browser/tests/test_questiontarget.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Test questiontarget views."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import os

=== modified file 'lib/lp/archiveuploader/tests/__init__.py'
--- lib/lp/archiveuploader/tests/__init__.py	2010-10-06 11:46:51 +0000
+++ lib/lp/archiveuploader/tests/__init__.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for the archive uploader."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 __all__ = [

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2010-10-07 04:28:17 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 

=== modified file 'lib/lp/bugs/browser/tests/test_bugtracker_views.py'
--- lib/lp/bugs/browser/tests/test_bugtracker_views.py	2010-09-19 23:52:49 +0000
+++ lib/lp/bugs/browser/tests/test_bugtracker_views.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for BugTracker views."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from zope.component import getUtility

=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py	2010-10-25 13:46:12 +0000
+++ lib/lp/bugs/model/tests/test_bug.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from canonical.testing.layers import DatabaseFunctionalLayer

=== modified file 'lib/lp/bugs/scripts/checkwatches/base.py'
--- lib/lp/bugs/scripts/checkwatches/base.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/scripts/checkwatches/base.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Common classes and functions for the checkwatches system."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'WorkingBase',

=== modified file 'lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py'
--- lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Classes and logic for the checkwatches BugWatchUpdater."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'BugWatchUpdater',

=== modified file 'lib/lp/bugs/scripts/checkwatches/core.py'
--- lib/lp/bugs/scripts/checkwatches/core.py	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/scripts/checkwatches/core.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Classes and logic for the checkwatches cronscript."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'BaseScheduler',

=== modified file 'lib/lp/bugs/scripts/checkwatches/remotebugupdater.py'
--- lib/lp/bugs/scripts/checkwatches/remotebugupdater.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/scripts/checkwatches/remotebugupdater.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Classes and logic for the remote bug updater."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'RemoteBugUpdater',

=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_base.py'
--- lib/lp/bugs/scripts/checkwatches/tests/test_base.py	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/scripts/checkwatches/tests/test_base.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for the `base` module."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from contextlib import contextmanager

=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_core.py'
--- lib/lp/bugs/scripts/checkwatches/tests/test_core.py	2010-10-21 04:19:36 +0000
+++ lib/lp/bugs/scripts/checkwatches/tests/test_core.py	2010-10-26 15:54:49 +0000
@@ -2,8 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 """Checkwatches unit tests."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import datetime

=== modified file 'lib/lp/bugs/tests/test_bugbranch.py'
--- lib/lp/bugs/tests/test_bugbranch.py	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/tests/test_bugbranch.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Tests for bug-branch linking from the bugs side."""
 
 __metaclass__ = type

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-10-02 11:41:43 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'PackageBuild',

=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py	2010-10-02 11:41:43 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for `IPackageBuild`."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import datetime

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for BranchView."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import (

=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py	2010-10-23 04:41:42 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for branch listing."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import timedelta

=== modified file 'lib/lp/code/browser/tests/test_codereviewcomment.py'
--- lib/lp/code/browser/tests/test_codereviewcomment.py	2010-10-06 18:53:53 +0000
+++ lib/lp/code/browser/tests/test_codereviewcomment.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for CodeReviewComments."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest

=== modified file 'lib/lp/code/browser/tests/test_codereviewvote.py'
--- lib/lp/code/browser/tests/test_codereviewvote.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/browser/tests/test_codereviewvote.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for CodeReviewVoteReferences."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-10-26 15:54:49 +0000
@@ -4,8 +4,6 @@
 
 """Tests for the source package recipe view classes and templates."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 

=== modified file 'lib/lp/code/mail/codehandler.py'
--- lib/lp/code/mail/codehandler.py	2010-09-23 20:38:59 +0000
+++ lib/lp/code/mail/codehandler.py	2010-10-26 15:54:49 +0000
@@ -1,9 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
-
 __metaclass__ = type
 
 

=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py	2010-10-18 01:55:45 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Testing the CodeHandler."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from difflib import unified_diff

=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py	2010-10-18 01:57:32 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py	2010-10-26 15:54:49 +0000
@@ -9,9 +9,6 @@
 """
 
 
-from __future__ import with_statement
-
-
 __metaclass__ = type
 
 

=== modified file 'lib/lp/code/model/directbranchcommit.py'
--- lib/lp/code/model/directbranchcommit.py	2010-10-06 11:46:51 +0000
+++ lib/lp/code/model/directbranchcommit.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Commit files straight to bzr branch."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'ConcurrentUpdateError',

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-10-26 15:54:49 +0000
@@ -6,8 +6,6 @@
 """Tests for Branches."""
 
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import (

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2010-10-07 22:46:08 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for BranchJobs."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import datetime

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
--- lib/lp/code/model/tests/test_branchmergeproposal.py	2010-10-19 00:44:24 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposal.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 # pylint: disable-msg=F0401
 
-from __future__ import with_statement
-
 """Tests for BranchMergeProposals."""
 
 __metaclass__ = type

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2010-10-20 01:17:42 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for branch merge proposal jobs."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import (

=== modified file 'lib/lp/code/model/tests/test_branchsubscription.py'
--- lib/lp/code/model/tests/test_branchsubscription.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/tests/test_branchsubscription.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for the BranchSubscrptions model object.."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest

=== modified file 'lib/lp/code/model/tests/test_diff.py'
--- lib/lp/code/model/tests/test_diff.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_diff.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for Diff, etc."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Test RecipeBuildBehavior."""
 
-from __future__ import with_statement
-
 # pylint: disable-msg=F0401
 
 __metaclass__ = type

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-09-22 21:03:48 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for the SourcePackageRecipe content type."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import (

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-10-06 11:46:51 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for source package builds."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import datetime

=== modified file 'lib/lp/code/scripts/tests/test_scan_branches.py'
--- lib/lp/code/scripts/tests/test_scan_branches.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/scripts/tests/test_scan_branches.py	2010-10-26 15:54:49 +0000
@@ -6,8 +6,6 @@
 """Test the scan_branches script."""
 
 
-from __future__ import with_statement
-
 from storm.locals import Store
 import transaction
 

=== modified file 'lib/lp/code/scripts/tests/test_sendbranchmail.py'
--- lib/lp/code/scripts/tests/test_sendbranchmail.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/scripts/tests/test_sendbranchmail.py	2010-10-26 15:54:49 +0000
@@ -5,8 +5,6 @@
 
 """Test the sendbranchmail script"""
 
-from __future__ import with_statement
-
 import unittest
 
 import transaction

=== modified file 'lib/lp/code/xmlrpc/tests/test_branch.py'
--- lib/lp/code/xmlrpc/tests/test_branch.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/xmlrpc/tests/test_branch.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for the public codehosting API."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = []
 

=== modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
--- lib/lp/codehosting/codeimport/tests/servers.py	2010-09-02 12:09:05 +0000
+++ lib/lp/codehosting/codeimport/tests/servers.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Server classes that know how to create various kinds of foreign archive."""
 
-from __future__ import with_statement
-
 __all__ = [
     'CVSServer',
     'GitServer',

=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
--- lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-10-21 04:19:36 +0000
+++ lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for creating BugBranch items based on Bazaar revisions."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest

=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-10-15 18:33:07 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-10-26 15:54:49 +0000
@@ -5,8 +5,6 @@
 
 # pylint: disable-msg=W0141
 
-from __future__ import with_statement
-
 import datetime
 import os
 import random

=== modified file 'lib/lp/codehosting/scanner/tests/test_mergedetection.py'
--- lib/lp/codehosting/scanner/tests/test_mergedetection.py	2010-10-21 04:19:36 +0000
+++ lib/lp/codehosting/scanner/tests/test_mergedetection.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for the scanner's merge detection."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import logging

=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
--- lib/lp/codehosting/tests/test_branchdistro.py	2010-09-29 02:20:44 +0000
+++ lib/lp/codehosting/tests/test_branchdistro.py	2010-10-26 15:54:49 +0000
@@ -4,8 +4,6 @@
 """Tests for making new source package branches just after a distro release.
 """
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import os

=== modified file 'lib/lp/codehosting/tests/test_jobs.py'
--- lib/lp/codehosting/tests/test_jobs.py	2010-10-04 19:50:45 +0000
+++ lib/lp/codehosting/tests/test_jobs.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for Job-running facilities."""
 
-from __future__ import with_statement
-
 from unittest import TestLoader
 
 from canonical.config import config

=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
--- lib/lp/codehosting/tests/test_sftp.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/tests/test_sftp.py	2010-10-26 15:54:49 +0000
@@ -3,7 +3,6 @@
 
 """Tests for the transport-backed SFTP server implementation."""
 
-from __future__ import with_statement
 from contextlib import closing
 import os
 import unittest

=== modified file 'lib/lp/registry/browser/tests/test_distroseriesdifference_views.py'
--- lib/lp/registry/browser/tests/test_distroseriesdifference_views.py	2010-09-28 08:30:16 +0000
+++ lib/lp/registry/browser/tests/test_distroseriesdifference_views.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for the DistroSeriesDifference views."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from BeautifulSoup import BeautifulSoup

=== modified file 'lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py'
--- lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py	2010-09-29 09:53:15 +0000
+++ lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import transaction

=== modified file 'lib/lp/registry/browser/tests/test_mailinglists.py'
--- lib/lp/registry/browser/tests/test_mailinglists.py	2010-08-20 20:31:18 +0000
+++ lib/lp/registry/browser/tests/test_mailinglists.py	2010-10-26 15:54:49 +0000
@@ -2,8 +2,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Test harness for mailinglist views unit tests."""
 
 __metaclass__ = type

=== modified file 'lib/lp/registry/browser/tests/test_milestone.py'
--- lib/lp/registry/browser/tests/test_milestone.py	2010-09-16 04:43:45 +0000
+++ lib/lp/registry/browser/tests/test_milestone.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Test milestone views."""
 
 __metaclass__ = type

=== modified file 'lib/lp/registry/browser/tests/test_peoplemerge.py'
--- lib/lp/registry/browser/tests/test_peoplemerge.py	2010-10-04 19:50:45 +0000
+++ lib/lp/registry/browser/tests/test_peoplemerge.py	2010-10-26 15:54:49 +0000
@@ -2,8 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 """Test the peoplemerge browser module."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from zope.component import getUtility

=== modified file 'lib/lp/registry/browser/tests/test_series_views.py'
--- lib/lp/registry/browser/tests/test_series_views.py	2010-10-06 18:53:53 +0000
+++ lib/lp/registry/browser/tests/test_series_views.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from BeautifulSoup import BeautifulSoup

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-10-26 02:02:12 +0000
+++ lib/lp/registry/model/person.py	2010-10-26 15:54:49 +0000
@@ -1,7 +1,5 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-from __future__ import with_statement
-
 # vars() causes W0612
 # pylint: disable-msg=E0611,W0212,W0612,C0322
 

=== modified file 'lib/lp/registry/tests/test_add_member.py'
--- lib/lp/registry/tests/test_add_member.py	2010-10-04 19:50:45 +0000
+++ lib/lp/registry/tests/test_add_member.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Test team membership changes."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from canonical.testing.layers import DatabaseFunctionalLayer

=== modified file 'lib/lp/registry/tests/test_distroseries.py'
--- lib/lp/registry/tests/test_distroseries.py	2010-10-04 20:46:55 +0000
+++ lib/lp/registry/tests/test_distroseries.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Tests for distroseries."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import transaction

=== modified file 'lib/lp/registry/tests/test_distroseriesdifference.py'
--- lib/lp/registry/tests/test_distroseriesdifference.py	2010-10-24 12:37:51 +0000
+++ lib/lp/registry/tests/test_distroseriesdifference.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Model tests for the DistroSeriesDifference class."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest

=== modified file 'lib/lp/registry/tests/test_mailinglist.py'
--- lib/lp/registry/tests/test_mailinglist.py	2010-10-04 19:50:45 +0000
+++ lib/lp/registry/tests/test_mailinglist.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = []
 

=== modified file 'lib/lp/registry/tests/test_mailinglistapi.py'
--- lib/lp/registry/tests/test_mailinglistapi.py	2010-10-04 19:50:45 +0000
+++ lib/lp/registry/tests/test_mailinglistapi.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for the private MailingList API."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = []
 

=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2010-09-29 14:16:22 +0000
+++ lib/lp/registry/tests/test_person.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from datetime import datetime

=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
--- lib/lp/registry/tests/test_sourcepackage.py	2010-08-24 15:29:01 +0000
+++ lib/lp/registry/tests/test_sourcepackage.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Unit tests for ISourcePackage implementations."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest

=== modified file 'lib/lp/services/features/tests/test_db_settings.py'
--- lib/lp/services/features/tests/test_db_settings.py	2010-08-20 20:31:18 +0000
+++ lib/lp/services/features/tests/test_db_settings.py	2010-10-26 15:54:49 +0000
@@ -4,7 +4,6 @@
 """Tests for feature settings coming from the database"""
 
 
-from __future__ import with_statement
 __metaclass__ = type
 
 from canonical.testing import layers

=== modified file 'lib/lp/services/features/tests/test_flags.py'
--- lib/lp/services/features/tests/test_flags.py	2010-09-28 09:29:46 +0000
+++ lib/lp/services/features/tests/test_flags.py	2010-10-26 15:54:49 +0000
@@ -4,7 +4,6 @@
 """Tests for feature flags."""
 
 
-from __future__ import with_statement
 __metaclass__ = type
 
 import os

=== modified file 'lib/lp/services/job/runner.py'
--- lib/lp/services/job/runner.py	2010-10-07 16:51:23 +0000
+++ lib/lp/services/job/runner.py	2010-10-26 15:54:49 +0000
@@ -4,7 +4,6 @@
 """Facilities for running Jobs."""
 
 
-from __future__ import with_statement
 __metaclass__ = type
 
 

=== modified file 'lib/lp/services/job/tests/test_runner.py'
--- lib/lp/services/job/tests/test_runner.py	2010-10-06 18:53:53 +0000
+++ lib/lp/services/job/tests/test_runner.py	2010-10-26 15:54:49 +0000
@@ -4,8 +4,6 @@
 """Tests for job-running facilities."""
 
 
-from __future__ import with_statement
-
 import sys
 from time import sleep
 from unittest import TestLoader

=== modified file 'lib/lp/services/log/tests/test_uniquefileallocator.py'
--- lib/lp/services/log/tests/test_uniquefileallocator.py	2010-10-13 16:35:06 +0000
+++ lib/lp/services/log/tests/test_uniquefileallocator.py	2010-10-26 15:54:49 +0000
@@ -3,7 +3,6 @@
 
 """Tests for the unique log naming facility."""
 
-from __future__ import with_statement
 __metaclass__ = type
 
 import datetime

=== modified file 'lib/lp/services/mailman/tests/test_lpmoderate.py'
--- lib/lp/services/mailman/tests/test_lpmoderate.py	2010-10-06 11:46:51 +0000
+++ lib/lp/services/mailman/tests/test_lpmoderate.py	2010-10-26 15:54:49 +0000
@@ -2,8 +2,6 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 """Test the lpmoderate monekypatches"""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = []
 

=== modified file 'lib/lp/services/spriteutils.py'
--- lib/lp/services/spriteutils.py	2010-08-20 20:31:18 +0000
+++ lib/lp/services/spriteutils.py	2010-10-26 15:54:49 +0000
@@ -6,8 +6,6 @@
 
 """Library to create sprites."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 __all__ = [

=== modified file 'lib/lp/services/utils.py'
--- lib/lp/services/utils.py	2010-08-20 20:31:18 +0000
+++ lib/lp/services/utils.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Generic Python utilities.
 
 Functions, lists and so forth. Nothing here that does system calls or network

=== modified file 'lib/lp/soyuz/browser/tests/test_archive_webservice.py'
--- lib/lp/soyuz/browser/tests/test_archive_webservice.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/browser/tests/test_archive_webservice.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest

=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
--- lib/lp/soyuz/scripts/tests/test_queue.py	2010-10-04 20:46:55 +0000
+++ lib/lp/soyuz/scripts/tests/test_queue.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """queue tool base class tests."""
 
-from __future__ import with_statement
-
 __metaclass__ = type
 __all__ = [
     'upload_bar_source',

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Test Archive features."""
 
 from datetime import date

=== modified file 'lib/lp/soyuz/tests/test_archive_subscriptions.py'
--- lib/lp/soyuz/tests/test_archive_subscriptions.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/tests/test_archive_subscriptions.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 """Test Archive features."""
 
-from __future__ import with_statement
-
 from zope.security.interfaces import Unauthorized
 
 from canonical.testing.layers import DatabaseFunctionalLayer

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py'
--- lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Tests for BinaryPackageBuildBehavior."""
 
 __metaclass__ = type

=== modified file 'lib/lp/soyuz/tests/test_copyarchivejob.py'
--- lib/lp/soyuz/tests/test_copyarchivejob.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/tests/test_copyarchivejob.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from zope.component import getUtility

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-10-25 13:16:10 +0000
+++ lib/lp/testing/__init__.py	2010-10-26 15:54:49 +0000
@@ -3,9 +3,6 @@
 
 # pylint: disable-msg=W0401,C0301,F0401
 
-from __future__ import with_statement
-
-
 __metaclass__ = type
 __all__ = [
     'ANONYMOUS',

=== modified file 'lib/lp/testing/_login.py'
--- lib/lp/testing/_login.py	2010-08-20 20:31:18 +0000
+++ lib/lp/testing/_login.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 # We like global statements!
 # pylint: disable-msg=W0602,W0603
 __metaclass__ = type

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-10-24 13:02:07 +0000
+++ lib/lp/testing/factory.py	2010-10-26 15:54:49 +0000
@@ -3,8 +3,6 @@
 
 # pylint: disable-msg=F0401
 
-from __future__ import with_statement
-
 """Testing infrastructure for the Launchpad application.
 
 This module should not contain tests (but it should be tested).

=== modified file 'lib/lp/testing/tests/test_login.py'
--- lib/lp/testing/tests/test_login.py	2010-08-20 20:31:18 +0000
+++ lib/lp/testing/tests/test_login.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Tests for the login helpers."""
 
 __metaclass__ = type

=== modified file 'lib/lp/testing/tests/test_testing.py'
--- lib/lp/testing/tests/test_testing.py	2010-09-29 20:36:26 +0000
+++ lib/lp/testing/tests/test_testing.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 """Tests for the testing module."""
 
 __metaclass__ = type

=== modified file 'lib/lp/translations/pottery/detect_intltool.py'
--- lib/lp/translations/pottery/detect_intltool.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/pottery/detect_intltool.py	2010-10-26 15:54:49 +0000
@@ -4,8 +4,6 @@
 """Functions to detect if intltool can be used to generate a POT file for the
 package in the current directory."""
 
-from __future__ import with_statement
-
 from contextlib import contextmanager
 
 

=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
--- lib/lp/translations/tests/test_autoapproval.py	2010-10-04 19:50:45 +0000
+++ lib/lp/translations/tests/test_autoapproval.py	2010-10-26 15:54:49 +0000
@@ -8,8 +8,6 @@
 through the possibilities should go here.
 """
 
-from __future__ import with_statement
-
 from contextlib import contextmanager
 from datetime import (
     datetime,

=== modified file 'lib/lp/translations/tests/test_pottery_detect_intltool.py'
--- lib/lp/translations/tests/test_pottery_detect_intltool.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_pottery_detect_intltool.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 import os
 from StringIO import StringIO
 import tarfile

=== modified file 'lib/lp/translations/tests/test_rosetta_branches_script.py'
--- lib/lp/translations/tests/test_rosetta_branches_script.py	2010-10-04 19:50:45 +0000
+++ lib/lp/translations/tests/test_rosetta_branches_script.py	2010-10-26 15:54:49 +0000
@@ -7,8 +7,6 @@
 provisions to handle Bazaar branches.
 """
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 from unittest import TestLoader

=== modified file 'lib/lp/translations/tests/test_translationimportqueue.py'
--- lib/lp/translations/tests/test_translationimportqueue.py	2010-10-04 19:50:45 +0000
+++ lib/lp/translations/tests/test_translationimportqueue.py	2010-10-26 15:54:49 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import with_statement
-
 __metaclass__ = type
 
 import unittest