another fix

2e99b236 · Robert Bradshaw · 0c7af76d · 2e99b236
Commit 2e99b236 authored Dec 11, 2010 by Robert Bradshaw
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

Cython/Shadow.py Cython/Shadow.py +9 -4

No files found.
--- a/Cython/Shadow.py
+++ b/Cython/Shadow.py
@@ -190,10 +190,15 @@ py_complex = complex
 try:
-    set
+    # Python 3
-except NameError:
+    from builtins import set, frozenset
-    # Python 2.3
+except ImportError:
-    from sets import Set as set, ImmutableSet as frozenset
+    try:
+        # Python 2.4+
+        from __builtin__ import set, frozenset
+    except ImportError:
+        # Py 2.3
+        from sets import Set as set, ImmutableSet as frozenset
 # Predefined types