merge the old python support fork0.2

1 files changed, 12 insertions, 8 deletions

diff --git a/hgdistver.py b/hgdistver.py
index f5a7f78..3cb1b3d 100644
--- a/hgdistver.py
+++ b/hgdistver.py
@@ -21,14 +21,18 @@ import os
 def version_from_cachefile(cachefile=None):
     if not cachefile:
         return
-    with open(cachefile) as fd:
-        fd.readline() # remove the comment
-        try:
-            line = fd.readline()
-            version_string = line.split(' = ')[1].strip()
-            return version_string[1:-1].decode('string-escape')
-        except: # any error means invalid cachefile
-            pass
+    #replaces 'with open()' from py2.6
+    fd = open(cachefile)
+    fd.readline() # remove the comment
+    version = None
+    try:
+        line = fd.readline()
+        version_string = line.split(' = ')[1].strip()
+        version = version_string[1:-1].decode('string-escape')
+    except: # any error means invalid cachefile
+        pass
+    fd.close()
+    return version
 
 
 def version_from_hg_id(cachefile=None):