Py2.6/3.0 import fixes

diff --git a/Cython/Compiler/Buffer.py b/Cython/Compiler/Buffer.py
index 59e6316597ca91429c961f30a5953ec8e285b3a4..45cb8196b2afe96315b68d140f0503fe046aa650 100644 (file)
--- a/Cython/Compiler/Buffer.py
+++ b/Cython/Compiler/Buffer.py
@@ -6,9 +6,13 @@ from Cython.Compiler.TreeFragment import TreeFragment
 from Cython.Utils import EncodedString
 from Cython.Compiler.Errors import CompileError
 import PyrexTypes
-from sets import Set as set
-import textwrap
 
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+import textwrap
 def dedent(text, reindent=0):
     text = textwrap.dedent(text)
     if reindent > 0:

diff --git a/Cython/Compiler/ParseTreeTransforms.py b/Cython/Compiler/ParseTreeTransforms.py
index 97ff9a82f97cbf03c8ea7ec833d65c8defb5845a..a775f7661ded67a3f5fd5c1cf20ad869e776cafa 100644 (file)
--- a/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@ -5,7 +5,10 @@ from Cython.Compiler.ExprNodes import *
 from Cython.Compiler.TreeFragment import TreeFragment
 from Cython.Utils import EncodedString
 from Cython.Compiler.Errors import CompileError
-from sets import Set as set
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 class NormalizeTree(CythonTransform):
     """

diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py
index 062ba696fd12f6313531d71263e6ac77ef06a9bf..3942faa263984d6eb765ccc1da05dba04b5852cf 100644 (file)
--- a/Cython/Compiler/Symtab.py
+++ b/Cython/Compiler/Symtab.py
@@ -15,7 +15,10 @@ from TypeSlots import \
     get_special_method_signature, get_property_accessor_signature
 import ControlFlow
 import __builtin__
-from sets import Set as set
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 possible_identifier = re.compile(ur"(?![0-9])\w+$", re.U).match
 nice_identifier = re.compile('^[a-zA-Z0-0_]+$').match