Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix bug in pickling MappingProxyType in PyPy 3.7+ #506

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Fix bug in pickling MappingProxyType in PyPy 3.7+ #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 7 additions & 24 deletions dill/_dill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,30 +1657,13 @@ def save_dictproxy(pickler, obj):
pickler.save_reduce(DictProxyType, (mapping,), obj=obj)
log.info("# Mp")
return
elif not IS_PYPY:
if not OLD33:
@register(DictProxyType)
def save_dictproxy(pickler, obj):
log.info("Mp: %s" % obj)
pickler.save_reduce(DictProxyType, (obj.copy(),), obj=obj)
log.info("# Mp")
return
else:
# The following function is based on 'saveDictProxy' from spickle
# Copyright (c) 2011 by science+computing ag
# License: http://www.apache.org/licenses/LICENSE-2.0
@register(DictProxyType)
def save_dictproxy(pickler, obj):
log.info("Dp: %s" % obj)
attr = obj.get('__dict__')
#pickler.save_reduce(_create_dictproxy, (attr,'nested'), obj=obj)
if type(attr) == GetSetDescriptorType and attr.__name__ == "__dict__" \
and getattr(attr.__objclass__, "__dict__", None) == obj:
pickler.save_reduce(getattr, (attr.__objclass__,"__dict__"),obj=obj)
log.info("# Dp")
return
# all bad below... so throw ReferenceError or TypeError
raise ReferenceError("%s does not reference a class __dict__" % obj)
else:
@register(DictProxyType)
def save_dictproxy(pickler, obj):
log.info("Mp: %s" % obj)
pickler.save_reduce(DictProxyType, (obj.copy(),), obj=obj)
log.info("# Mp")
return

@register(SliceType)
def save_slice(pickler, obj):
Expand Down
6 changes: 5 additions & 1 deletion tests/test_dictviews.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
# - https://github.com/uqfoundation/dill/blob/master/LICENSE

import dill
from dill._dill import OLD310, MAPPING_PROXY_TRICK
from dill._dill import OLD310, MAPPING_PROXY_TRICK, DictProxyType

def test_dictproxy():
assert dill.copy(DictProxyType({'a': 2}))

def test_dictviews():
x = {'a': 1}
Expand All @@ -31,5 +34,6 @@ def test_dictproxy_trick():
assert dict(seperate_views[1]) == new_x

if __name__ == '__main__':
test_dictproxy()
test_dictviews()
test_dictproxy_trick()