Make nullptr assignable to cyobject

a0666fde · gsamain · Xavier Thompson · f906d9a6 · a0666fde
Commit a0666fde authored Jun 19, 2019 by gsamain Committed by Xavier Thompson Jun 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Cython/Compiler/PyrexTypes.py Cython/Compiler/PyrexTypes.py +1 -1

No files found.
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -4063,7 +4063,7 @@ class CypClassType(CppClassType):
        return "((%s)%s)" % (self.declaration_code(''), expr_code)

    def assignable_from_resolved_type(self, other_type):
-        if other_type.is_ptr and other_type.base_type.is_cpp_class and other_type.base_type.is_subclass(self):
+        if other_type.is_ptr and other_type.base_type.is_cpp_class and other_type.base_type.is_subclass(self) or other_type.is_null_ptr:
            return 1
        return super(CypClassType, self).assignable_from_resolved_type(other_type)