refresh from jsonpickle master #1
Merged
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
Add further pickle protocol 2 support Signed-off-by: David Aguilar <davvid@gmail.com>
We might want to consider eliminating jsonpickle._samples (again) if we can move everything inline instead. Signed-off-by: David Aguilar <davvid@gmail.com>
An interesting edge case in Python is:
class ObjectWithIterableSlots(object):
__slots__ = iter('a')
def __init__(self, a):
self.a = a
print(jsonpickle.encode(ObjectWithIterableSlots('a')))
The reason this is tricky is because __slots__ is an iterator
object and is consumed the first time it is used. The initial
consumer may be python itself when building the class object.
There's no way to reset an iterator in Python but we can at
least use dir() to find attribute names when the __slots__
iterator has already been consumed.
Fallback to using dir() if we don't find any attributes when
iterating over __slots__.
Closes #67
Reported-by: Jason R. Coombs <jaraco@jaraco.com>
Helped-by: Marcin Tustin <marcin.tustin@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
u'' is not portable. Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Python 3.4's object.__new__() takes a single parameter only. Signed-off-by: David Aguilar <davvid@gmail.com>
Closes #66 Reported-by: Jason R. Coombs <jaraco@jaraco.com> Signed-off-by: David Aguilar <davvid@gmail.com>
Teach jsonpickle to warn about objects that it cannot directly serialize, e.g. file descriptors. Add tests to verify that we properly serialize these objects as None. Closes #3 Signed-off-by: David Aguilar <davvid@gmail.com>
marcintustin
added a commit
that referenced
this pull request
Aug 23, 2014
refresh from jsonpickle master
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.
No description provided.