Fix unpickling of CallbackRegistry on Py2. #7914
Merged
Conversation
This file contains hidden or 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
tacaswell
approved these changes
Jan 22, 2017
|
There will be some conflicts with #7830; not sure which one to merge first. |
In general, callbacks may not be pickled; thus, we simply recreate an empty dictionary at unpickling. In order to ensure that `__setstate__` (which just defers to `__init__`) is called, `__getstate__` must return a truthy value (for pickle protocol>=3, i.e. Py3, the *actual* behavior is that `__setstate__` will be called as long as `__getstate__` does not return `None`, but this is undocumented -- see http://bugs.python.org/issue12290).
e415ed1 to
ef3072e
Compare
Current coverage is 62.18% (diff: 100%)@@ master #7914 diff @@
==========================================
Files 175 175
Lines 56125 56125
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 34901 34901
Misses 21224 21224
Partials 0 0
|
|
Not a problem anymore. |
NelleV
approved these changes
Jan 24, 2017
NelleV
added a commit
that referenced
this pull request
Jan 24, 2017
Fix unpickling of CallbackRegistry on Py2.
|
Backported to v2.0.x by 5813452 |
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.
In general, callbacks may not be pickled; thus, we simply recreate an
empty dictionary at unpickling. In order to ensure that
__setstate__(which just defers to
__init__) is called,__getstate__mustreturn a truthy value (for pickle protocol>=3, i.e. Py3, the
actual behavior is that
__setstate__will be called as long as__getstate__does not returnNone, but this is undocumented -- seehttp://bugs.python.org/issue12290).
Closes #6048, #7902.