Commit f75b953a authored by Stefan Behnel's avatar Stefan Behnel

reverted accidental left-over in last commit

parent 0c584f69
...@@ -2034,8 +2034,7 @@ def spanning_type(type1, type2): ...@@ -2034,8 +2034,7 @@ def spanning_type(type1, type2):
# external types are unsafe, so we use PyObject instead # external types are unsafe, so we use PyObject instead
return py_object_type return py_object_type
return type1 return type1
elif type2.assignable_from(type1) and \ elif type2.assignable_from(type1):
not (type2.is_typedef and type2.typedef_is_external):
if type2.is_extension_type and type2.typeobj_is_imported(): if type2.is_extension_type and type2.typeobj_is_imported():
# external types are unsafe, so we use PyObject instead # external types are unsafe, so we use PyObject instead
return py_object_type return py_object_type
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment