Commit cae149de authored by Jason Madden's avatar Jason Madden

Use new release of ExtensionClass to remove workarounds.

parent 91c8b797
...@@ -68,7 +68,7 @@ setup( ...@@ -68,7 +68,7 @@ setup(
], ],
ext_modules=ext_modules, ext_modules=ext_modules,
install_requires=[ install_requires=[
'ExtensionClass >= 4.1a1', 'ExtensionClass >= 4.1.1',
'zope.interface', 'zope.interface',
], ],
include_package_data=True, include_package_data=True,
......
...@@ -669,9 +669,6 @@ class _Acquirer(ExtensionClass.Base): ...@@ -669,9 +669,6 @@ class _Acquirer(ExtensionClass.Base):
def __getattribute__(self, name): def __getattribute__(self, name):
try: try:
# workaround ExtensionClass bug #3
if name == '__parent__':
return object.__getattribute__(self, name)
return ExtensionClass.Base.__getattribute__(self, name) return ExtensionClass.Base.__getattribute__(self, name)
except AttributeError: except AttributeError:
# the doctests have very specific error message # the doctests have very specific error message
...@@ -679,13 +676,6 @@ class _Acquirer(ExtensionClass.Base): ...@@ -679,13 +676,6 @@ class _Acquirer(ExtensionClass.Base):
raise AttributeError(name) raise AttributeError(name)
def __of__(self, context): def __of__(self, context):
# Workaround ExtensionClass bug #3
try:
if not isinstance(self, _Wrapper) \
and self is object.__getattribute__(context, '__parent__'):
return self
except AttributeError:
pass
return type(self)._Wrapper(self, context) return type(self)._Wrapper(self, context)
......
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