support 'frozenset' in cython namespace (just like 'set')

diff --git a/Cython/Compiler/ParseTreeTransforms.py b/Cython/Compiler/ParseTreeTransforms.py
index 01ea5aaa2863511071160ab6e5442ccbc055adfe..ce213c968d74ade5cbe56160b9f693fce5d6f84f 100644 (file)
--- a/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@ -1261,8 +1261,8 @@ class TransformBuiltinMethods(EnvTransform):
                 node = BoolNode(node.pos, value=True)
             elif attribute == u'NULL':
                 node = NullNode(node.pos)
-            elif attribute == u'set':
-                node = NameNode(node.pos, name=EncodedString('set'))
+            elif attribute in (u'set', u'frozenset'):
+                node = NameNode(node.pos, name=EncodedString(attribute))
             elif not PyrexTypes.parse_basic_type(attribute):
                 error(node.pos, u"'%s' not a valid cython attribute or is being used incorrectly" % attribute)
         return node

diff --git a/Cython/Shadow.py b/Cython/Shadow.py
index e3f7f9e74a0654e53f04f44b0f6c664e8834e34a..9175b8a0780435b2f40edc5cf414d6aaabaf46bd 100644 (file)
--- a/Cython/Shadow.py
+++ b/Cython/Shadow.py
@@ -162,14 +162,14 @@ except NameError: # Py3
 
 try:
     # Python 3
-    from builtins import set
+    from builtins import set, frozenset
 except ImportError:
     try:
         # Python 2.4+
-        from __builtin__ import set
+        from __builtin__ import set, frozenset
     except ImportError:
         # Py 2.3
-        from sets import Set as set
+        from sets import Set as set, ImmutableSet as frozenset
 
 # Predefined types