-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #7. Make the Python Acquirer cooperatively call super, and test this. #8
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,12 +44,21 @@ def _rebound_method(method, wrapper): | |
if isinstance(method, types.MethodType): | ||
method = types.MethodType(method.im_func, wrapper, method.im_class) | ||
return method | ||
exec("""def _reraise(tp, value, tb=None): | ||
raise tp, value, tb | ||
""") | ||
else: # pragma: no cover (python 2 is currently our reference) | ||
def _rebound_method(method, wrapper): | ||
"""Returns a version of the method with self bound to `wrapper`""" | ||
if isinstance(method, types.MethodType): | ||
method = types.MethodType(method.__func__, wrapper) | ||
return method | ||
def _reraise(tp, value, tb=None): | ||
if value is None: | ||
value = tp() | ||
if value.__traceback__ is not tb: | ||
raise value.with_traceback(tb) | ||
raise value | ||
|
||
### | ||
# Wrapper object protocol, mostly ported from C directly | ||
|
@@ -684,11 +693,12 @@ class _Acquirer(ExtensionClass.Base): | |
|
||
def __getattribute__(self, name): | ||
try: | ||
return ExtensionClass.Base.__getattribute__(self, name) | ||
return super(_Acquirer,self).__getattribute__(name) | ||
except AttributeError: | ||
# the doctests have very specific error message | ||
# requirements | ||
raise AttributeError(name) | ||
# requirements (but at least we can preserve the traceback) | ||
t, v, tb = sys.exc_info() | ||
_reraise(AttributeError, AttributeError(name), tb) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Binding the traceback to a local variable has historically been a source of reference leaks. Maybe wrap it in a |
||
|
||
def __of__(self, context): | ||
return type(self)._Wrapper(self, context) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: space after comma.