reverted accidental left-over in last commit
authorStefan Behnel <scoder@users.berlios.de>
Fri, 4 Dec 2009 11:09:09 +0000 (12:09 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 4 Dec 2009 11:09:09 +0000 (12:09 +0100)
Cython/Compiler/PyrexTypes.py

index d54cd5710b723b1d454f695fc9f2665d0d7d76fe..264981e6e2a6a8814b9b6a75bf1302d276fbe5dc 100644 (file)
@@ -2034,8 +2034,7 @@ def spanning_type(type1, type2):
             # external types are unsafe, so we use PyObject instead
             return py_object_type
         return type1
-    elif type2.assignable_from(type1) and \
-             not (type2.is_typedef and type2.typedef_is_external):
+    elif type2.assignable_from(type1):
         if type2.is_extension_type and type2.typeobj_is_imported():
             # external types are unsafe, so we use PyObject instead
             return py_object_type