Commit 7392f606 authored by Robert Bradshaw's avatar Robert Bradshaw Committed by GitHub

Merge pull request #1621 from jdemeyer/metaclass_prepare_pyobject

Pass metaclass as PyObject* (and not PyTypeObject*)
parents 56a44bf2 2fe9693a
...@@ -8493,7 +8493,7 @@ class Py3ClassNode(ExprNode): ...@@ -8493,7 +8493,7 @@ class Py3ClassNode(ExprNode):
else: else:
mkw = 'NULL' mkw = 'NULL'
if self.metaclass: if self.metaclass:
metaclass = self.metaclass.result() metaclass = self.metaclass.py_result()
else: else:
metaclass = "((PyObject*)&__Pyx_DefaultClassType)" metaclass = "((PyObject*)&__Pyx_DefaultClassType)"
code.putln( code.putln(
...@@ -8579,7 +8579,7 @@ class PyClassNamespaceNode(ExprNode, ModuleNameMixin): ...@@ -8579,7 +8579,7 @@ class PyClassNamespaceNode(ExprNode, ModuleNameMixin):
else: else:
mkw = '(PyObject *) NULL' mkw = '(PyObject *) NULL'
if self.metaclass: if self.metaclass:
metaclass = self.metaclass.result() metaclass = self.metaclass.py_result()
else: else:
metaclass = "(PyObject *) NULL" metaclass = "(PyObject *) NULL"
code.putln( code.putln(
......
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