Commit 88b78289 authored by gsamain's avatar gsamain

Remove CClassDefNode nogil handling

parent 2ad234e2
...@@ -4793,7 +4793,6 @@ class CClassDefNode(ClassDefNode): ...@@ -4793,7 +4793,6 @@ class CClassDefNode(ClassDefNode):
# doc string or None # doc string or None
# body StatNode or None # body StatNode or None
# entry Symtab.Entry # entry Symtab.Entry
# nogil boolean
# base_type PyExtensionType or None # base_type PyExtensionType or None
# buffer_defaults_node DictNode or None Declares defaults for a buffer # buffer_defaults_node DictNode or None Declares defaults for a buffer
# buffer_defaults_pos # buffer_defaults_pos
...@@ -4803,7 +4802,6 @@ class CClassDefNode(ClassDefNode): ...@@ -4803,7 +4802,6 @@ class CClassDefNode(ClassDefNode):
buffer_defaults_pos = None buffer_defaults_pos = None
typedef_flag = False typedef_flag = False
api = False api = False
nogil = False
objstruct_name = None objstruct_name = None
typeobj_name = None typeobj_name = None
check_size = None check_size = None
...@@ -4844,7 +4842,6 @@ class CClassDefNode(ClassDefNode): ...@@ -4844,7 +4842,6 @@ class CClassDefNode(ClassDefNode):
typedef_flag=self.typedef_flag, typedef_flag=self.typedef_flag,
check_size = self.check_size, check_size = self.check_size,
api=self.api, api=self.api,
nogil=self.nogil,
buffer_defaults=self.buffer_defaults(env), buffer_defaults=self.buffer_defaults(env),
shadow=self.shadow) shadow=self.shadow)
...@@ -4894,12 +4891,6 @@ class CClassDefNode(ClassDefNode): ...@@ -4894,12 +4891,6 @@ class CClassDefNode(ClassDefNode):
base_type.name in ('tuple', 'str', 'bytes'): base_type.name in ('tuple', 'str', 'bytes'):
error(base.pos, "inheritance from PyVarObject types like '%s' is not currently supported" error(base.pos, "inheritance from PyVarObject types like '%s' is not currently supported"
% base_type.name) % base_type.name)
elif base_type.is_extension_type and (base_type.nogil != self.nogil):
error(base.pos, """
inheritance between PyExtensionType and CythonExtensionType is not currently supported
(trying to make %s inherit from %s)
"""
% (self.class_name, base_type.name))
else: else:
self.base_type = base_type self.base_type = base_type
if env.directives.get('freelist', 0) > 0 and base_type != PyrexTypes.py_object_type: if env.directives.get('freelist', 0) > 0 and base_type != PyrexTypes.py_object_type:
...@@ -4939,7 +4930,6 @@ inheritance between PyExtensionType and CythonExtensionType is not currently sup ...@@ -4939,7 +4930,6 @@ inheritance between PyExtensionType and CythonExtensionType is not currently sup
visibility=self.visibility, visibility=self.visibility,
typedef_flag=self.typedef_flag, typedef_flag=self.typedef_flag,
api=self.api, api=self.api,
nogil=self.nogil,
buffer_defaults=self.buffer_defaults(env), buffer_defaults=self.buffer_defaults(env),
shadow=self.shadow) shadow=self.shadow)
......
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