Merge branch '0.25.x'

Cython/Compiler/ExprNodes.py

@@ -6396,7 +6396,11 @@ class AttributeNode(ExprNode):
                     return self.as_name_node(env, ubcm_entry, target=False)
             elif type.is_enum:
                 if self.attribute in type.values:
-                    return self.as_name_node(env, env.lookup(self.attribute), target=False)
+                    for entry in type.entry.enum_values:
+                        if entry.name == self.attribute:
+                            return self.as_name_node(env, entry, target=False)
+                    else:
+                        error(self.pos, "%s not a known value of %s" % (self.attribute, type))
                 else:
                     error(self.pos, "%s not a known value of %s" % (self.attribute, type))
         return None

Cython/Shadow.py

 # cython.* namespace for pure mode.
 from __future__ import absolute_import
 
-__version__ = "0.25.1"
+__version__ = "0.25.2b0"
 
 try:
     from __builtin__ import basestring

tests/run/pyintop.pyx

@@ -159,16 +159,16 @@ def lshift_int(obj):
     >>> bigints(lshift_int(-32))
     (-256, -68719476736, -295147905179352825856, -340282366920938463463374607431768211456)
 
-    >>> (2**28) << 3
+    >>> bigint((2**28) << 3)
     2147483648
     >>> bigints(lshift_int(2**28))
     (2147483648, 576460752303423488, 2475880078570760549798248448, 2854495385411919762116571938898990272765493248)
-    >>> (-2**28) << 3
+    >>> bigint((-2**28) << 3)
     -2147483648
     >>> bigints(lshift_int(-2**28))
     (-2147483648, -576460752303423488, -2475880078570760549798248448, -2854495385411919762116571938898990272765493248)
 
-    >>> (2**30) << 3
+    >>> bigint((2**30) << 3)
     8589934592
     >>> bigints(lshift_int(2**30))
     (8589934592, 2305843009213693952, 9903520314283042199192993792, 11417981541647679048466287755595961091061972992)