diff --git a/kallithea/bin/kallithea_api.py b/kallithea/bin/kallithea_api.py
--- a/kallithea/bin/kallithea_api.py
+++ b/kallithea/bin/kallithea_api.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import sys
 import argparse
 
diff --git a/kallithea/bin/kallithea_config.py b/kallithea/bin/kallithea_config.py
--- a/kallithea/bin/kallithea_config.py
+++ b/kallithea/bin/kallithea_config.py
@@ -28,7 +28,6 @@ Original author and date, and relevant c
 """
 
 
-from __future__ import with_statement
 import os
 import sys
 import uuid
diff --git a/kallithea/bin/kallithea_gist.py b/kallithea/bin/kallithea_gist.py
--- a/kallithea/bin/kallithea_gist.py
+++ b/kallithea/bin/kallithea_gist.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import sys
 import stat
diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py
--- a/kallithea/config/routing.py
+++ b/kallithea/config/routing.py
@@ -19,7 +19,6 @@ may take precedent over the more generic
 refer to the routes manual at http://routes.groovie.org/docs/
 """
 
-from __future__ import with_statement
 from routes import Mapper
 
 # prefix for non repository related links needs to be prefixed with `/`
diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py
--- a/kallithea/controllers/files.py
+++ b/kallithea/controllers/files.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import logging
 import traceback
diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py
--- a/kallithea/lib/auth.py
+++ b/kallithea/lib/auth.py
@@ -24,7 +24,6 @@ Original author and date, and relevant c
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
-from __future__ import with_statement
 import time
 import os
 import logging
diff --git a/kallithea/lib/indexers/daemon.py b/kallithea/lib/indexers/daemon.py
--- a/kallithea/lib/indexers/daemon.py
+++ b/kallithea/lib/indexers/daemon.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/cache_keys.py b/kallithea/lib/paster_commands/cache_keys.py
--- a/kallithea/lib/paster_commands/cache_keys.py
+++ b/kallithea/lib/paster_commands/cache_keys.py
@@ -26,7 +26,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/cleanup.py b/kallithea/lib/paster_commands/cleanup.py
--- a/kallithea/lib/paster_commands/cleanup.py
+++ b/kallithea/lib/paster_commands/cleanup.py
@@ -26,7 +26,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/ishell.py b/kallithea/lib/paster_commands/ishell.py
--- a/kallithea/lib/paster_commands/ishell.py
+++ b/kallithea/lib/paster_commands/ishell.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/make_index.py b/kallithea/lib/paster_commands/make_index.py
--- a/kallithea/lib/paster_commands/make_index.py
+++ b/kallithea/lib/paster_commands/make_index.py
@@ -26,7 +26,6 @@ Original author and date, and relevant c
 
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/make_rcextensions.py b/kallithea/lib/paster_commands/make_rcextensions.py
--- a/kallithea/lib/paster_commands/make_rcextensions.py
+++ b/kallithea/lib/paster_commands/make_rcextensions.py
@@ -26,7 +26,6 @@ Original author and date, and relevant c
 
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/repo_scan.py b/kallithea/lib/paster_commands/repo_scan.py
--- a/kallithea/lib/paster_commands/repo_scan.py
+++ b/kallithea/lib/paster_commands/repo_scan.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/paster_commands/update_repoinfo.py b/kallithea/lib/paster_commands/update_repoinfo.py
--- a/kallithea/lib/paster_commands/update_repoinfo.py
+++ b/kallithea/lib/paster_commands/update_repoinfo.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/lib/pidlock.py b/kallithea/lib/pidlock.py
--- a/kallithea/lib/pidlock.py
+++ b/kallithea/lib/pidlock.py
@@ -12,7 +12,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import with_statement
 import os
 import errno
 
diff --git a/kallithea/lib/profiler.py b/kallithea/lib/profiler.py
--- a/kallithea/lib/profiler.py
+++ b/kallithea/lib/profiler.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import objgraph
 import cProfile
diff --git a/kallithea/model/api_key.py b/kallithea/model/api_key.py
--- a/kallithea/model/api_key.py
+++ b/kallithea/model/api_key.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import time
 import logging
 from sqlalchemy import or_
diff --git a/kallithea/model/gist.py b/kallithea/model/gist.py
--- a/kallithea/model/gist.py
+++ b/kallithea/model/gist.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import time
 import logging
diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py
--- a/kallithea/model/repo.py
+++ b/kallithea/model/repo.py
@@ -26,7 +26,6 @@ Original author and date, and relevant c
 
 """
 
-from __future__ import with_statement
 import os
 import shutil
 import logging
diff --git a/kallithea/model/scm.py b/kallithea/model/scm.py
--- a/kallithea/model/scm.py
+++ b/kallithea/model/scm.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import re
 import time
diff --git a/kallithea/tests/api/api_base.py b/kallithea/tests/api/api_base.py
--- a/kallithea/tests/api/api_base.py
+++ b/kallithea/tests/api/api_base.py
@@ -18,7 +18,6 @@ tests for api. run with::
     KALLITHEA_WHOOSH_TEST_DISABLE=1 nosetests --with-coverage --cover-package=kallithea.controllers.api.api -x kallithea/tests/api
 """
 
-from __future__ import with_statement
 import os
 import random
 import mock
diff --git a/kallithea/tests/functional/test_admin.py b/kallithea/tests/functional/test_admin.py
--- a/kallithea/tests/functional/test_admin.py
+++ b/kallithea/tests/functional/test_admin.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import os
 import csv
 import datetime
diff --git a/kallithea/tests/functional/test_login.py b/kallithea/tests/functional/test_login.py
--- a/kallithea/tests/functional/test_login.py
+++ b/kallithea/tests/functional/test_login.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import re
 import time
 
diff --git a/kallithea/tests/models/test_diff_parsers.py b/kallithea/tests/models/test_diff_parsers.py
--- a/kallithea/tests/models/test_diff_parsers.py
+++ b/kallithea/tests/models/test_diff_parsers.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 from kallithea.tests import *
 from kallithea.lib.diffs import DiffProcessor, NEW_FILENODE, DEL_FILENODE, \
     MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE
diff --git a/kallithea/tests/other/test_libs.py b/kallithea/tests/other/test_libs.py
--- a/kallithea/tests/other/test_libs.py
+++ b/kallithea/tests/other/test_libs.py
@@ -25,7 +25,6 @@ Original author and date, and relevant c
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import datetime
 import hashlib
 import mock
diff --git a/kallithea/tests/vcs/test_archives.py b/kallithea/tests/vcs/test_archives.py
--- a/kallithea/tests/vcs/test_archives.py
+++ b/kallithea/tests/vcs/test_archives.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import tarfile
diff --git a/kallithea/tests/vcs/test_branches.py b/kallithea/tests/vcs/test_branches.py
--- a/kallithea/tests/vcs/test_branches.py
+++ b/kallithea/tests/vcs/test_branches.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.lib import vcs
diff --git a/kallithea/tests/vcs/test_changesets.py b/kallithea/tests/vcs/test_changesets.py
--- a/kallithea/tests/vcs/test_changesets.py
+++ b/kallithea/tests/vcs/test_changesets.py
@@ -1,5 +1,4 @@
 # encoding: utf8
-from __future__ import with_statement
 
 import time
 import datetime
diff --git a/kallithea/tests/vcs/test_filenodes_unicode_path.py b/kallithea/tests/vcs/test_filenodes_unicode_path.py
--- a/kallithea/tests/vcs/test_filenodes_unicode_path.py
+++ b/kallithea/tests/vcs/test_filenodes_unicode_path.py
@@ -1,6 +1,5 @@
 # encoding: utf8
 
-from __future__ import with_statement
 
 import datetime
 from kallithea.lib.vcs.nodes import FileNode
diff --git a/kallithea/tests/vcs/test_getitem.py b/kallithea/tests/vcs/test_getitem.py
--- a/kallithea/tests/vcs/test_getitem.py
+++ b/kallithea/tests/vcs/test_getitem.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
diff --git a/kallithea/tests/vcs/test_getslice.py b/kallithea/tests/vcs/test_getslice.py
--- a/kallithea/tests/vcs/test_getslice.py
+++ b/kallithea/tests/vcs/test_getslice.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
diff --git a/kallithea/tests/vcs/test_git.py b/kallithea/tests/vcs/test_git.py
--- a/kallithea/tests/vcs/test_git.py
+++ b/kallithea/tests/vcs/test_git.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import sys
diff --git a/kallithea/tests/vcs/test_hg.py b/kallithea/tests/vcs/test_hg.py
--- a/kallithea/tests/vcs/test_hg.py
+++ b/kallithea/tests/vcs/test_hg.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 from kallithea.lib.vcs.backends.hg import MercurialRepository, MercurialChangeset
diff --git a/kallithea/tests/vcs/test_inmemchangesets.py b/kallithea/tests/vcs/test_inmemchangesets.py
--- a/kallithea/tests/vcs/test_inmemchangesets.py
+++ b/kallithea/tests/vcs/test_inmemchangesets.py
@@ -2,7 +2,6 @@
 """
 Tests so called "in memory changesets" commit API of vcs.
 """
-from __future__ import with_statement
 
 import time
 import datetime
diff --git a/kallithea/tests/vcs/test_nodes.py b/kallithea/tests/vcs/test_nodes.py
--- a/kallithea/tests/vcs/test_nodes.py
+++ b/kallithea/tests/vcs/test_nodes.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import stat
 from kallithea.lib.vcs.nodes import DirNode
diff --git a/kallithea/tests/vcs/test_repository.py b/kallithea/tests/vcs/test_repository.py
--- a/kallithea/tests/vcs/test_repository.py
+++ b/kallithea/tests/vcs/test_repository.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
diff --git a/kallithea/tests/vcs/test_tags.py b/kallithea/tests/vcs/test_tags.py
--- a/kallithea/tests/vcs/test_tags.py
+++ b/kallithea/tests/vcs/test_tags.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
diff --git a/kallithea/tests/vcs/test_utils.py b/kallithea/tests/vcs/test_utils.py
--- a/kallithea/tests/vcs/test_utils.py
+++ b/kallithea/tests/vcs/test_utils.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import mock
diff --git a/kallithea/tests/vcs/test_utils_filesize.py b/kallithea/tests/vcs/test_utils_filesize.py
--- a/kallithea/tests/vcs/test_utils_filesize.py
+++ b/kallithea/tests/vcs/test_utils_filesize.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 from kallithea.lib.vcs.utils.filesize import filesizeformat
 from kallithea.lib.vcs.utils.compat import unittest
diff --git a/kallithea/tests/vcs/test_vcs.py b/kallithea/tests/vcs/test_vcs.py
--- a/kallithea/tests/vcs/test_vcs.py
+++ b/kallithea/tests/vcs/test_vcs.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import shutil
diff --git a/kallithea/tests/vcs/test_workdirs.py b/kallithea/tests/vcs/test_workdirs.py
--- a/kallithea/tests/vcs/test_workdirs.py
+++ b/kallithea/tests/vcs/test_workdirs.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.lib.vcs.nodes import FileNode