changeset 5474:431689d7f37d

remove vestiges of Python 2.5 support We only support Python 2.6 and 2.7; hence we do not need to import with-statement support from __future__.
author Søren Løvborg <sorenl@unity3d.com>
date Mon, 31 Aug 2015 17:42:57 +0200
parents d402d1e4aed4
children e3bb18948760
files kallithea/bin/kallithea_api.py kallithea/bin/kallithea_config.py kallithea/bin/kallithea_gist.py kallithea/config/routing.py kallithea/controllers/files.py kallithea/lib/auth.py kallithea/lib/indexers/daemon.py kallithea/lib/paster_commands/cache_keys.py kallithea/lib/paster_commands/cleanup.py kallithea/lib/paster_commands/ishell.py kallithea/lib/paster_commands/make_index.py kallithea/lib/paster_commands/make_rcextensions.py kallithea/lib/paster_commands/repo_scan.py kallithea/lib/paster_commands/update_repoinfo.py kallithea/lib/pidlock.py kallithea/lib/profiler.py kallithea/model/api_key.py kallithea/model/gist.py kallithea/model/repo.py kallithea/model/scm.py kallithea/tests/api/api_base.py kallithea/tests/functional/test_admin.py kallithea/tests/functional/test_login.py kallithea/tests/models/test_diff_parsers.py kallithea/tests/other/test_libs.py kallithea/tests/vcs/test_archives.py kallithea/tests/vcs/test_branches.py kallithea/tests/vcs/test_changesets.py kallithea/tests/vcs/test_filenodes_unicode_path.py kallithea/tests/vcs/test_getitem.py kallithea/tests/vcs/test_getslice.py kallithea/tests/vcs/test_git.py kallithea/tests/vcs/test_hg.py kallithea/tests/vcs/test_inmemchangesets.py kallithea/tests/vcs/test_nodes.py kallithea/tests/vcs/test_repository.py kallithea/tests/vcs/test_tags.py kallithea/tests/vcs/test_utils.py kallithea/tests/vcs/test_utils_filesize.py kallithea/tests/vcs/test_vcs.py kallithea/tests/vcs/test_workdirs.py
diffstat 41 files changed, 0 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/bin/kallithea_api.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/bin/kallithea_api.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import sys
 import argparse
 
--- a/kallithea/bin/kallithea_config.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/bin/kallithea_config.py	Mon Aug 31 17:42:57 2015 +0200
@@ -28,7 +28,6 @@
 """
 
 
-from __future__ import with_statement
 import os
 import sys
 import uuid
--- a/kallithea/bin/kallithea_gist.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/bin/kallithea_gist.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import sys
 import stat
--- a/kallithea/config/routing.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/config/routing.py	Mon Aug 31 17:42:57 2015 +0200
@@ -19,7 +19,6 @@
 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 `/`
--- a/kallithea/controllers/files.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/controllers/files.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import logging
 import traceback
--- a/kallithea/lib/auth.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/auth.py	Mon Aug 31 17:42:57 2015 +0200
@@ -24,7 +24,6 @@
 :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
--- a/kallithea/lib/indexers/daemon.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/indexers/daemon.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/cache_keys.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/cache_keys.py	Mon Aug 31 17:42:57 2015 +0200
@@ -26,7 +26,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/cleanup.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/cleanup.py	Mon Aug 31 17:42:57 2015 +0200
@@ -26,7 +26,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/ishell.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/ishell.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/make_index.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/make_index.py	Mon Aug 31 17:42:57 2015 +0200
@@ -26,7 +26,6 @@
 
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/make_rcextensions.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/make_rcextensions.py	Mon Aug 31 17:42:57 2015 +0200
@@ -26,7 +26,6 @@
 
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/repo_scan.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/repo_scan.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/paster_commands/update_repoinfo.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/paster_commands/update_repoinfo.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/lib/pidlock.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/pidlock.py	Mon Aug 31 17:42:57 2015 +0200
@@ -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
 
--- a/kallithea/lib/profiler.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/lib/profiler.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import objgraph
 import cProfile
--- a/kallithea/model/api_key.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/model/api_key.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import time
 import logging
 from sqlalchemy import or_
--- a/kallithea/model/gist.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/model/gist.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import time
 import logging
--- a/kallithea/model/repo.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/model/repo.py	Mon Aug 31 17:42:57 2015 +0200
@@ -26,7 +26,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import shutil
 import logging
--- a/kallithea/model/scm.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/model/scm.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import os
 import re
 import time
--- a/kallithea/tests/api/api_base.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/api/api_base.py	Mon Aug 31 17:42:57 2015 +0200
@@ -18,7 +18,6 @@
     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
--- a/kallithea/tests/functional/test_admin.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/functional/test_admin.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import os
 import csv
 import datetime
--- a/kallithea/tests/functional/test_login.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/functional/test_login.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import re
 import time
 
--- a/kallithea/tests/models/test_diff_parsers.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/models/test_diff_parsers.py	Mon Aug 31 17:42:57 2015 +0200
@@ -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
--- a/kallithea/tests/other/test_libs.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/other/test_libs.py	Mon Aug 31 17:42:57 2015 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-from __future__ import with_statement
 import datetime
 import hashlib
 import mock
--- a/kallithea/tests/vcs/test_archives.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_archives.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import tarfile
--- a/kallithea/tests/vcs/test_branches.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_branches.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.lib import vcs
--- a/kallithea/tests/vcs/test_changesets.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_changesets.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,5 +1,4 @@
 # encoding: utf8
-from __future__ import with_statement
 
 import time
 import datetime
--- a/kallithea/tests/vcs/test_filenodes_unicode_path.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_filenodes_unicode_path.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,6 +1,5 @@
 # encoding: utf8
 
-from __future__ import with_statement
 
 import datetime
 from kallithea.lib.vcs.nodes import FileNode
--- a/kallithea/tests/vcs/test_getitem.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_getitem.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
--- a/kallithea/tests/vcs/test_getslice.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_getslice.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
--- a/kallithea/tests/vcs/test_git.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_git.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import sys
--- a/kallithea/tests/vcs/test_hg.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_hg.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 from kallithea.lib.vcs.backends.hg import MercurialRepository, MercurialChangeset
--- a/kallithea/tests/vcs/test_inmemchangesets.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_inmemchangesets.py	Mon Aug 31 17:42:57 2015 +0200
@@ -2,7 +2,6 @@
 """
 Tests so called "in memory changesets" commit API of vcs.
 """
-from __future__ import with_statement
 
 import time
 import datetime
--- a/kallithea/tests/vcs/test_nodes.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_nodes.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import stat
 from kallithea.lib.vcs.nodes import DirNode
--- a/kallithea/tests/vcs/test_repository.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_repository.py	Mon Aug 31 17:42:57 2015 +0200
@@ -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
--- a/kallithea/tests/vcs/test_tags.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_tags.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
--- a/kallithea/tests/vcs/test_utils.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_utils.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import mock
--- a/kallithea/tests/vcs/test_utils_filesize.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_utils_filesize.py	Mon Aug 31 17:42:57 2015 +0200
@@ -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
--- a/kallithea/tests/vcs/test_vcs.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_vcs.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import os
 import shutil
--- a/kallithea/tests/vcs/test_workdirs.py	Thu Sep 03 23:49:27 2015 +0200
+++ b/kallithea/tests/vcs/test_workdirs.py	Mon Aug 31 17:42:57 2015 +0200
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 import datetime
 from kallithea.lib.vcs.nodes import FileNode