Avoid raising a SystemError when clearing slots if setstate() failed. #62
Conversation
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
tseaver
requested changes
Mar 20, 2017
persistent/tests/test_persistence.py
Outdated
| @@ -68,7 +71,7 @@ def register(self, obj): | |||
| jar._cache = self._makeCache(jar) | |||
| return jar | |||
|
|
|||
| def _makeBrokenJar(self): | |||
| def _makeBrokenJar(self, exc=NotImplementedError): | |||
There was a problem hiding this comment.
This extra indirection seems like YAGNI.
There was a problem hiding this comment.
OK. I was imagining that NotImplementedError might be caught and handled specially somewhere so I wanted to be sure to have something that would definitely propagate. But that is hypothetical, I admit.
PR #52 introduced a code path to `ghostify` that calls PyErr_Clear() with the intent to avoid propagating AttributeErrors for slots. However, if there is an error (like a POSKeyError) raised by jar.setstate(), then `unghostify` will call ghostify with an error pending. If the object had slots that weren't set and the AttributeError was cleared, so was the pending error from setstate. So when `ghostify` returned NULL that got propagated up to the interpreter which finds no exception and so raises `SystemError: error return without exception set`. This commit makes `unghostify` save and restore the exception state around the call to PyErr_Clear.
jamadden
force-pushed
the
jam-systemerror
branch
from
b7846d4
to
e8b9c8e
Compare
|
@tseaver Could we get a merge and release please? |
|
Thank you! |
gforcada
added a commit
to derFreitag/ZODB
that referenced
this pull request
Jun 5, 2018
The fix was done upstream at: zopefoundation/persistent#62
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR #52 introduced a code path to
ghostifythat calls PyErr_Clear() with the intent to avoid propagatingAttributeErrorsfor slots.However, if there is an error (like a POSKeyError) raised by jar.setstate(), then
unghostifywill callghostifywith an error pending. If the object had slots that weren't set and theAttributeErrorwas cleared, so was the pending error from setstate. So whenghostifyreturned NULL that got propagated up to the interpreter which finds no exception and so raisesSystemError: error return without exception set.This commit makes
unghostifysave and restore the exception state around the call toPyErr_Clearso the real exception is raised, rather than the baffling and unhelpful SystemError.