# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1360852763 -3600
# Node ID d901c36bcfce89301d07a9c541838ea0dc9de487
# Parent  a6ca96ec86938213f01528c63d09ce584384f673
[toward-py3k] remove import with_statement (part of #2711624)

They are unneeded since we dropped python 2.5 compatibility. This will help
Python 3.3 experimentation.

diff -r a6ca96ec8693 -r d901c36bcfce __init__.py
--- a/__init__.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/__init__.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,8 +18,6 @@
 """CubicWeb is a generic framework to quickly build applications which describes
 relations between entitites.
 """
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 # ignore the pygments UserWarnings
diff -r a6ca96ec8693 -r d901c36bcfce devtools/__init__.py
--- a/devtools/__init__.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/devtools/__init__.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """Test tools for cubicweb"""
 
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import os
diff -r a6ca96ec8693 -r d901c36bcfce devtools/httptest.py
--- a/devtools/httptest.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/devtools/httptest.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,8 +18,6 @@
 """this module contains base classes and utilities for integration with running
 http server
 """
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import threading
diff -r a6ca96ec8693 -r d901c36bcfce devtools/test/unittest_testlib.py
--- a/devtools/test/unittest_testlib.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/devtools/test/unittest_testlib.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unittests for cw.devtools.testlib module"""
-from __future__ import with_statement
 
 from cStringIO import StringIO
 
diff -r a6ca96ec8693 -r d901c36bcfce devtools/testlib.py
--- a/devtools/testlib.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/devtools/testlib.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """this module contains base classes and utilities for cubicweb tests"""
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import os
diff -r a6ca96ec8693 -r d901c36bcfce entities/test/unittest_base.py
--- a/entities/test/unittest_base.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/entities/test/unittest_base.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,9 +17,7 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for cubicweb.entities.base module
-
 """
-from __future__ import with_statement
 
 from logilab.common.testlib import unittest_main
 from logilab.common.decorators import clear_cache
diff -r a6ca96ec8693 -r d901c36bcfce entities/test/unittest_wfobjs.py
--- a/entities/test/unittest_wfobjs.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/entities/test/unittest_wfobjs.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import with_statement
-
 from cubicweb import ValidationError
 from cubicweb.devtools.testlib import CubicWebTC
 
diff -r a6ca96ec8693 -r d901c36bcfce etwist/server.py
--- a/etwist/server.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/etwist/server.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """twisted server for CubicWeb web instances"""
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce hooks/test/unittest_hooks.py
--- a/hooks/test/unittest_hooks.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/hooks/test/unittest_hooks.py	Thu Feb 14 15:39:23 2013 +0100
@@ -21,7 +21,6 @@
 Note:
   syncschema.py hooks are mostly tested in server/test/unittest_migrations.py
 """
-from __future__ import with_statement
 
 from datetime import datetime
 
diff -r a6ca96ec8693 -r d901c36bcfce hooks/test/unittest_integrity.py
--- a/hooks/test/unittest_integrity.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/hooks/test/unittest_integrity.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,8 +18,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """functional tests for integrity hooks"""
 
-from __future__ import with_statement
-
 from cubicweb import ValidationError
 from cubicweb.devtools.testlib import CubicWebTC
 
diff -r a6ca96ec8693 -r d901c36bcfce hooks/test/unittest_syncsession.py
--- a/hooks/test/unittest_syncsession.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/hooks/test/unittest_syncsession.py	Thu Feb 14 15:39:23 2013 +0100
@@ -21,7 +21,6 @@
 Note:
   syncschema.py hooks are mostly tested in server/test/unittest_migrations.py
 """
-from __future__ import with_statement
 
 from cubicweb import ValidationError
 from cubicweb.devtools.testlib import CubicWebTC
diff -r a6ca96ec8693 -r d901c36bcfce misc/migration/3.10.0_Any.py
--- a/misc/migration/3.10.0_Any.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/misc/migration/3.10.0_Any.py	Thu Feb 14 15:39:23 2013 +0100
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from cubicweb.server.session import hooks_control
 
 for uri, cfg in config.sources().items():
diff -r a6ca96ec8693 -r d901c36bcfce misc/migration/3.10.9_Any.py
--- a/misc/migration/3.10.9_Any.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/misc/migration/3.10.9_Any.py	Thu Feb 14 15:39:23 2013 +0100
@@ -1,7 +1,5 @@
-from __future__ import with_statement
 import sys
 
-
 if confirm('fix some corrupted entities noticed on several instances?'):
     rql('DELETE CWConstraint X WHERE NOT E constrained_by X')
     rql('SET X is_instance_of Y WHERE X is Y, NOT X is_instance_of Y')
diff -r a6ca96ec8693 -r d901c36bcfce misc/migration/bootstrapmigration_repository.py
--- a/misc/migration/bootstrapmigration_repository.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/misc/migration/bootstrapmigration_repository.py	Thu Feb 14 15:39:23 2013 +0100
@@ -19,7 +19,6 @@
 
 it should only include low level schema changes
 """
-from __future__ import with_statement
 
 from cubicweb.server.session import hooks_control
 from cubicweb.server import schemaserial as ss
diff -r a6ca96ec8693 -r d901c36bcfce misc/scripts/repair_file_1-9_migration.py
--- a/misc/scripts/repair_file_1-9_migration.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/misc/scripts/repair_file_1-9_migration.py	Thu Feb 14 15:39:23 2013 +0100
@@ -4,7 +4,6 @@
 * on our intranet on July 07 2010
 * on our extranet on July 16 2010
 """
-from __future__ import with_statement
 
 try:
     backupinstance, = __args__
diff -r a6ca96ec8693 -r d901c36bcfce rqlrewrite.py
--- a/rqlrewrite.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/rqlrewrite.py	Thu Feb 14 15:39:23 2013 +0100
@@ -20,8 +20,6 @@
 
 This is used for instance for read security checking in the repository.
 """
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from rql import nodes as n, stmts, TypeResolverException
diff -r a6ca96ec8693 -r d901c36bcfce server/__init__.py
--- a/server/__init__.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/__init__.py	Thu Feb 14 15:39:23 2013 +0100
@@ -21,8 +21,6 @@
 The server module contains functions to initialize a new repository.
 """
 
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce server/checkintegrity.py
--- a/server/checkintegrity.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/checkintegrity.py	Thu Feb 14 15:39:23 2013 +0100
@@ -20,9 +20,6 @@
 * integrity of a CubicWeb repository. Hum actually only the system database is
   checked.
 """
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce server/edition.py
--- a/server/edition.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/edition.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """helper classes to handle server-side edition of entities"""
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from copy import copy
diff -r a6ca96ec8693 -r d901c36bcfce server/hook.py
--- a/server/hook.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/hook.py	Thu Feb 14 15:39:23 2013 +0100
@@ -245,9 +245,6 @@
 .. autoclass:: cubicweb.server.hook.LateOperation
 .. autoclass:: cubicweb.server.hook.DataOperationMixIn
 """
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from warnings import warn
diff -r a6ca96ec8693 -r d901c36bcfce server/migractions.py
--- a/server/migractions.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/migractions.py	Thu Feb 14 15:39:23 2013 +0100
@@ -26,9 +26,6 @@
 * add an entity
 * execute raw RQL queries
 """
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce server/mssteps.py
--- a/server/mssteps.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/mssteps.py	Thu Feb 14 15:39:23 2013 +0100
@@ -22,8 +22,6 @@
 * each step has is own members (this is not necessarily bad, but a bit messy
   for now)
 """
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from rql.nodes import VariableRef, Variable, Function
diff -r a6ca96ec8693 -r d901c36bcfce server/querier.py
--- a/server/querier.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/querier.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,9 +18,6 @@
 """Helper classes to execute RQL queries on a set of sources, performing
 security checking and data aggregation.
 """
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from itertools import repeat
diff -r a6ca96ec8693 -r d901c36bcfce server/repository.py
--- a/server/repository.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/repository.py	Thu Feb 14 15:39:23 2013 +0100
@@ -26,9 +26,6 @@
 * handles session management
 * provides method for pyro registration, to call if pyro is enabled
 """
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce server/session.py
--- a/server/session.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/session.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """Repository users' and internal' sessions."""
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce server/sources/datafeed.py
--- a/server/sources/datafeed.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/sources/datafeed.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,7 +18,6 @@
 """datafeed sources: copy data from an external data stream into the system
 database
 """
-from __future__ import with_statement
 
 import urllib2
 import StringIO
diff -r a6ca96ec8693 -r d901c36bcfce server/sources/native.py
--- a/server/sources/native.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/sources/native.py	Thu Feb 14 15:39:23 2013 +0100
@@ -23,9 +23,6 @@
   string. This is because it should actually be Bytes but we want an index on
   it for fast querying.
 """
-
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 try:
diff -r a6ca96ec8693 -r d901c36bcfce server/ssplanner.py
--- a/server/ssplanner.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/ssplanner.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """plan execution of rql queries on a single source"""
 
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from rql.stmts import Union, Select
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_datafeed.py
--- a/server/test/unittest_datafeed.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_datafeed.py	Thu Feb 14 15:39:23 2013 +0100
@@ -15,7 +15,6 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import with_statement
 
 from datetime import timedelta
 
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_hook.py
--- a/server/test/unittest_hook.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_hook.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,17 +18,13 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit/functional tests for cubicweb.server.hook"""
 
-from __future__ import with_statement
-
 from logilab.common.testlib import TestCase, unittest_main, mock_object
 
-
 from cubicweb.devtools import TestServerConfiguration, fake
 from cubicweb.devtools.testlib import CubicWebTC
 from cubicweb.server import hook
 from cubicweb.hooks import integrity, syncschema
 
-
 def clean_session_ops(func):
     def wrapper(self, *args, **kwargs):
         try:
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_ldapuser.py
--- a/server/test/unittest_ldapuser.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_ldapuser.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """cubicweb.server.sources.ldapusers unit and functional tests"""
-from __future__ import with_statement
 
 import os
 import shutil
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_migractions.py
--- a/server/test/unittest_migractions.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_migractions.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for module cubicweb.server.migractions"""
 
-from __future__ import with_statement
-
 from copy import deepcopy
 from datetime import date
 from os.path import join
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_msplanner.py
--- a/server/test/unittest_msplanner.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_msplanner.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for module cubicweb.server.msplanner"""
 
-from __future__ import with_statement
-
 from logilab.common.decorators import clear_cache
 from yams.buildobjs import RelationDefinition
 from rql import BadRQLQuery
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_postgres.py
--- a/server/test/unittest_postgres.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_postgres.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import with_statement
-
 import socket
 from datetime import datetime
 
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_querier.py
--- a/server/test/unittest_querier.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_querier.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,7 +18,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for modules cubicweb.server.querier and cubicweb.server.ssplanner
 """
-from __future__ import with_statement
 
 from datetime import date, datetime, timedelta, tzinfo
 
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_repository.py
--- a/server/test/unittest_repository.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_repository.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,8 +18,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for module cubicweb.server.repository"""
 
-from __future__ import with_statement
-
 import os
 import sys
 import threading
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_security.py
--- a/server/test/unittest_security.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_security.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """functional tests for server'security"""
-from __future__ import with_statement
 
 import sys
 
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_session.py
--- a/server/test/unittest_session.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_session.py	Thu Feb 14 15:39:23 2013 +0100
@@ -15,11 +15,9 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import with_statement
 
 from cubicweb.devtools.testlib import CubicWebTC
 
-
 class InternalSessionTC(CubicWebTC):
     def test_dbapi_query(self):
         session = self.repo.internal_session()
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_storage.py
--- a/server/test/unittest_storage.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_storage.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for module cubicweb.server.sources.storages"""
 
-from __future__ import with_statement
-
 from logilab.common.testlib import unittest_main, tag, Tags
 from cubicweb.devtools.testlib import CubicWebTC
 
diff -r a6ca96ec8693 -r d901c36bcfce server/test/unittest_undo.py
--- a/server/test/unittest_undo.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/server/test/unittest_undo.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,7 +16,6 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import with_statement
 
 from cubicweb import ValidationError
 from cubicweb.devtools.testlib import CubicWebTC
diff -r a6ca96ec8693 -r d901c36bcfce sobjects/ldapparser.py
--- a/sobjects/ldapparser.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/sobjects/ldapparser.py	Thu Feb 14 15:39:23 2013 +0100
@@ -20,8 +20,6 @@
 unlike ldapuser source, this source is copy based and will import ldap content
 (beside passwords for authentication) into the system source.
 """
-from __future__ import with_statement
-
 from logilab.common.decorators import cached, cachedproperty
 from logilab.common.shellutils import generate_password
 
diff -r a6ca96ec8693 -r d901c36bcfce sobjects/test/unittest_cwxmlparser.py
--- a/sobjects/test/unittest_cwxmlparser.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/sobjects/test/unittest_cwxmlparser.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,12 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import with_statement
-
 from datetime import datetime
 
 from cubicweb.devtools.testlib import CubicWebTC
-
 from cubicweb.sobjects.cwxmlparser import CWEntityXMLParser
 
 orig_parse = CWEntityXMLParser.parse
diff -r a6ca96ec8693 -r d901c36bcfce test/unittest_dbapi.py
--- a/test/unittest_dbapi.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/test/unittest_dbapi.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unittest for cubicweb.dbapi"""
 
-from __future__ import with_statement
-
 from copy import copy
 
 from logilab.common import tempattr
diff -r a6ca96ec8693 -r d901c36bcfce test/unittest_entity.py
--- a/test/unittest_entity.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/test/unittest_entity.py	Thu Feb 14 15:39:23 2013 +0100
@@ -18,8 +18,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for cubicweb.web.views.entities module"""
 
-from __future__ import with_statement
-
 from datetime import datetime
 
 from logilab.common import tempattr
diff -r a6ca96ec8693 -r d901c36bcfce test/unittest_predicates.py
--- a/test/unittest_predicates.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/test/unittest_predicates.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for selectors mechanism"""
-from __future__ import with_statement
 
 from operator import eq, lt, le, gt
 from logilab.common.testlib import TestCase, unittest_main
diff -r a6ca96ec8693 -r d901c36bcfce test/unittest_schema.py
--- a/test/unittest_schema.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/test/unittest_schema.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for module cubicweb.schema"""
 
-from __future__ import with_statement
-
 import sys
 from os.path import join, isabs, basename, dirname
 
diff -r a6ca96ec8693 -r d901c36bcfce web/application.py
--- a/web/application.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/application.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """CubicWeb web client application object"""
 
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 import sys
diff -r a6ca96ec8693 -r d901c36bcfce web/test/unittest_application.py
--- a/web/test/unittest_application.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/test/unittest_application.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for cubicweb.web.application"""
 
-from __future__ import with_statement
-
 import base64, Cookie
 import sys
 from urllib import unquote
diff -r a6ca96ec8693 -r d901c36bcfce web/test/unittest_idownloadable.py
--- a/web/test/unittest_idownloadable.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/test/unittest_idownloadable.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,7 +16,6 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import with_statement
 
 from functools import partial
 
diff -r a6ca96ec8693 -r d901c36bcfce web/test/unittest_views_basecontrollers.py
--- a/web/test/unittest_views_basecontrollers.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/test/unittest_views_basecontrollers.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """cubicweb.web.views.basecontrollers unit tests"""
 
-from __future__ import with_statement
-
 from urlparse import urlsplit, urlunsplit, urljoin
 # parse_qs is deprecated in cgi and has been moved to urlparse in Python 2.6
 try:
diff -r a6ca96ec8693 -r d901c36bcfce web/test/unittest_views_baseviews.py
--- a/web/test/unittest_views_baseviews.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/test/unittest_views_baseviews.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import with_statement
-
 from logilab.common.testlib import unittest_main
 from logilab.mtconverter import html_unescape
 
diff -r a6ca96ec8693 -r d901c36bcfce web/test/unittest_views_errorform.py
--- a/web/test/unittest_views_errorform.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/test/unittest_views_errorform.py	Thu Feb 14 15:39:23 2013 +0100
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import with_statement
-
 from logilab.common.testlib import unittest_main
 from logilab.mtconverter import html_unescape
 
diff -r a6ca96ec8693 -r d901c36bcfce web/test/unittest_views_staticcontrollers.py
--- a/web/test/unittest_views_staticcontrollers.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/test/unittest_views_staticcontrollers.py	Thu Feb 14 15:39:23 2013 +0100
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from logilab.common.testlib import tag, Tags
 from cubicweb.devtools.testlib import CubicWebTC
 
diff -r a6ca96ec8693 -r d901c36bcfce web/views/authentication.py
--- a/web/views/authentication.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/views/authentication.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """user authentication component"""
 
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 
 from threading import Lock
diff -r a6ca96ec8693 -r d901c36bcfce web/views/basecomponents.py
--- a/web/views/basecomponents.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/views/basecomponents.py	Thu Feb 14 15:39:23 2013 +0100
@@ -20,8 +20,6 @@
 * the rql input form
 * the logged user link
 """
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 _ = unicode
 
diff -r a6ca96ec8693 -r d901c36bcfce web/views/boxes.py
--- a/web/views/boxes.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/views/boxes.py	Thu Feb 14 15:39:23 2013 +0100
@@ -25,8 +25,6 @@
 * possible views box
 * startup views box
 """
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 _ = unicode
 
diff -r a6ca96ec8693 -r d901c36bcfce web/views/forms.py
--- a/web/views/forms.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/views/forms.py	Thu Feb 14 15:39:23 2013 +0100
@@ -41,7 +41,6 @@
 
 but you'll use this one rarely.
 """
-from __future__ import with_statement
 __docformat__ = "restructuredtext en"
 
 from warnings import warn
diff -r a6ca96ec8693 -r d901c36bcfce web/views/json.py
--- a/web/views/json.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/views/json.py	Thu Feb 14 15:39:23 2013 +0100
@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """json export views"""
 
-from __future__ import with_statement
-
 __docformat__ = "restructuredtext en"
 _ = unicode
 
diff -r a6ca96ec8693 -r d901c36bcfce web/views/staticcontrollers.py
--- a/web/views/staticcontrollers.py	Thu Feb 14 15:29:20 2013 +0100
+++ b/web/views/staticcontrollers.py	Thu Feb 14 15:39:23 2013 +0100
@@ -22,7 +22,6 @@
 - /fckeditor/...
 
 """
-from __future__ import with_statement
 
 import os
 import os.path as osp