diff --git a/.pydevproject b/.pydevproject
index 27c2485a..837d5449 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -5,6 +5,6 @@
/git-repo
-python 2.6
+python 2.7
Default
diff --git a/event_log.py b/event_log.py
index 2f1b180b..508b18ee 100644
--- a/event_log.py
+++ b/event_log.py
@@ -18,8 +18,6 @@ from __future__ import print_function
import json
import multiprocessing
-from pyversion import is_python3
-
TASK_COMMAND = 'command'
TASK_SYNC_NETWORK = 'sync-network'
TASK_SYNC_LOCAL = 'sync-local'
@@ -73,7 +71,7 @@ class EventLog(object):
A dictionary of the event added to the log.
"""
event = {
- 'id': (kind, self._next_id.__next__() if is_python3() else self._next_id.next()),
+ 'id': (kind, next(self._next_id)),
'name': name,
'task_name': task_name,
'start_time': start,
diff --git a/repo b/repo
index 7e7f13fa..7ffa7705 100755
--- a/repo
+++ b/repo
@@ -113,7 +113,7 @@ repodir = '.repo' # name of repo's private directory
S_repo = 'repo' # special repo repository
S_manifests = 'manifests' # special manifest repository
REPO_MAIN = S_repo + '/main.py' # main script
-MIN_PYTHON_VERSION = (2, 6) # minimum supported python version
+MIN_PYTHON_VERSION = (2, 7) # minimum supported python version
GITC_CONFIG_FILE = '/gitc/.config'
GITC_FS_ROOT_DIR = '/gitc/manifest-rw/'
@@ -152,9 +152,12 @@ def _print(*objects, **kwargs):
# Python version check
ver = sys.version_info
if (ver[0], ver[1]) < MIN_PYTHON_VERSION:
- _print('error: Python version %s unsupported.\n'
- 'Please use Python 2.6 - 2.7 instead.'
- % sys.version.split(' ')[0], file=sys.stderr)
+ _print('error: Python version {} unsupported.\n'
+ 'Please use Python {}.{} instead.'.format(
+ sys.version.split(' ')[0],
+ MIN_PYTHON_VERSION[0],
+ MIN_PYTHON_VERSION[1],
+ ), file=sys.stderr)
sys.exit(1)
home_dot_repo = os.path.expanduser('~/.repoconfig')
@@ -909,6 +912,6 @@ def main(orig_args):
if __name__ == '__main__':
if ver[0] == 3:
_print('warning: Python 3 support is currently experimental. YMMV.\n'
- 'Please use Python 2.6 - 2.7 instead.',
+ 'Please use Python 2.7 instead.',
file=sys.stderr)
main(sys.argv[1:])