merge

Cython/Compiler/Builtin.py

@@ -28,7 +28,7 @@ builtin_function_table = [
     #('hex',       "",     "",      ""),
     #('id',        "",     "",      ""),
     #('input',     "",     "",      ""),
-    ('intern',     "s",    "O",     "__Pyx_InternFromString"),
+    #('intern',     "s",    "O",     "__Pyx_InternFromString"), # Doesn't work for Python str objects with null characters.
     ('isinstance', "OO",   "b",     "PyObject_IsInstance"),
     ('issubclass', "OO",   "b",     "PyObject_IsSubclass"),
     ('iter',       "O",    "O",     "PyObject_GetIter"),

Cython/Compiler/Optimize.py

@@ -685,7 +685,7 @@ class OptimizeBuiltinCalls(Visitor.VisitorTransform):
                 return function_handler(node, arg_tuple, kwargs)
             else:
                 return function_handler(node, arg_tuple)
-        elif isinstance(function, ExprNodes.AttributeNode):
+        elif function.is_attribute:
             arg_list = arg_tuple.args
             self_arg = function.obj
             obj_type = self_arg.type