From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 4 Dec 2009 11:09:09 +0000 (+0100)
Subject: reverted accidental left-over in last commit
X-Git-Tag: 0.12.1~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f75b953a112a86f4e3c66e3933c92926c222f3a5;p=cython.git

reverted accidental left-over in last commit
---

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index d54cd571..264981e6 100644
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -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