Py2.6/3.0 import fixes

diff --git a/Cython/Compiler/Code.py b/Cython/Compiler/Code.py
index a07b640a8e69a97047a2961b8f1b2a9b415817bf..1cbde366a664d7272673f18df9b0f6b3e54631f8 100644 (file)
--- a/Cython/Compiler/Code.py
+++ b/Cython/Compiler/Code.py
@@ -10,7 +10,10 @@ from PyrexTypes import py_object_type, typecast
 from TypeSlots import method_coexist
 from Scanning import SourceDescriptor
 from Cython.StringIOTree import StringIOTree
-from sets import Set as set
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 class FunctionContext(object):
     # Not used for now, perhaps later

diff --git a/Cython/Compiler/Scanning.py b/Cython/Compiler/Scanning.py
index 32c833a3f827cc5afbaff2608b2a09d78b24a655..9737f97767c17444d7940341c7cdbe015215498b 100644 (file)
--- a/Cython/Compiler/Scanning.py
+++ b/Cython/Compiler/Scanning.py
@@ -38,7 +38,10 @@ def hash_source_file(path):
     # Try to calculate a hash code for the given source file.
     # Returns an empty string if the file cannot be accessed.
     #print "Hashing", path ###
-    import md5
+    try:
+        from hashlib import md5 as new_md5
+    except ImportError:
+        from md5 import new as new_md5
     try:
         try:
             f = open(path, "rU")
@@ -54,7 +57,7 @@ def hash_source_file(path):
     # tabs by a single space.
     import re
     text = re.sub("[ \t]+", " ", text)
-    hash = md5.new(text).hexdigest()
+    hash = new_md5(text).hexdigest()
     return hash
 
 def open_pickled_lexicon(expected_hash):