summaryrefslogtreecommitdiff
path: root/git-remote-testgit.py
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2010-06-10 00:24:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-14 03:02:50 (GMT)
commit23b093ee087e99049585487f59e262a0e0662b6e (patch)
tree9fcd50dbb19072e7a107f0f81cd1da4c5ecafc1b /git-remote-testgit.py
parentae45732214a092baa8b78a5cea462e4a7a538165 (diff)
downloadgit-23b093ee087e99049585487f59e262a0e0662b6e.zip
git-23b093ee087e99049585487f59e262a0e0662b6e.tar.gz
git-23b093ee087e99049585487f59e262a0e0662b6e.tar.bz2
Remove python 2.5'isms
The following python 2.5 features were worked around: * the sha module is used as a fallback when the hashlib module is not available * the 'any' built-in method was replaced with a 'for' loop * a conditional expression was replaced with an 'if' statement * the subprocess.check_call method was replaced by a call to subprocess.Popen followed by a call to subprocess.wait with a check of its return status These changes allow the python infrastructure to be used with python 2.4 which is distributed with RedHat's RHEL 5, for example. t5800 was updated to check for python >= 2.4 to reflect these changes. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-remote-testgit.py')
-rw-r--r--git-remote-testgit.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/git-remote-testgit.py b/git-remote-testgit.py
index 9253922..df9d512 100644
--- a/git-remote-testgit.py
+++ b/git-remote-testgit.py
@@ -1,6 +1,12 @@
#!/usr/bin/env python
-import hashlib
+# hashlib is only available in python >= 2.5
+try:
+ import hashlib
+ _digest = hashlib.sha1
+except ImportError:
+ import sha
+ _digest = sha.new
import sys
import os
sys.path.insert(0, os.getenv("GITPYTHONLIB","."))
@@ -19,7 +25,7 @@ def get_repo(alias, url):
repo.get_revs()
repo.get_head()
- hasher = hashlib.sha1()
+ hasher = _digest()
hasher.update(repo.path)
repo.hash = hasher.hexdigest()
@@ -133,7 +139,10 @@ def do_export(repo, args):
path = os.path.join(dirname, 'testgit.marks')
print path
- print path if os.path.exists(path) else ""
+ if os.path.exists(path):
+ print path
+ else:
+ print ""
sys.stdout.flush()
update_local_repo(repo)