aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-04 10:25:34 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-04 10:25:34 -0800
commit3e515b0d40d9ad483c4f1e076c2726d91ccc072d (patch)
treecc13ab3fb287adb12e4be67482e6907dea3dd201 /contrib
parent9aea11dbc152726bbbe93630cc29b10c29d4f62e (diff)
parentae6037bc710b248946ed715fd659ef535ea78980 (diff)
downloadgit-3e515b0d40d9ad483c4f1e076c2726d91ccc072d.tar.gz
git-3e515b0d40d9ad483c4f1e076c2726d91ccc072d.tar.xz
Merge branch 'jk/remote-helpers-in-python-3'
Prepare remote-helper test written in Python to be run with Python3. * jk/remote-helpers-in-python-3: git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" git-remote-testpy: fix path hashing on Python 3 git-remote-testpy: call print as a function git-remote-testpy: don't do unbuffered text I/O git-remote-testpy: hash bytes explicitly svn-fe: allow svnrdump_sim.py to run with Python 3 git_remote_helpers: use 2to3 if building with Python 3 git_remote_helpers: force rebuild if python version changes git_remote_helpers: fix input when running under Python 3 git_remote_helpers: allow building with Python 3
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/svn-fe/svnrdump_sim.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/svn-fe/svnrdump_sim.py b/contrib/svn-fe/svnrdump_sim.py
index 17cf6f961..4e78a1c3c 100755
--- a/contrib/svn-fe/svnrdump_sim.py
+++ b/contrib/svn-fe/svnrdump_sim.py
@@ -14,7 +14,7 @@ if sys.hexversion < 0x02040000:
def getrevlimit():
var = 'SVNRMAX'
- if os.environ.has_key(var):
+ if var in os.environ:
return os.environ[var]
return None
@@ -44,7 +44,7 @@ def writedump(url, lower, upper):
if __name__ == "__main__":
if not (len(sys.argv) in (3, 4, 5)):
- print "usage: %s dump URL -rLOWER:UPPER"
+ print("usage: %s dump URL -rLOWER:UPPER")
sys.exit(1)
if not sys.argv[1] == 'dump': raise NotImplementedError('only "dump" is suppported.')
url = sys.argv[2]