From b78b6d6d8dbc3fad0360084d27ad4249e685eb0c Mon Sep 17 00:00:00 2001
From: anivegesana <anirudh.vegesana@gmail.com>
Date: Thu, 9 Jun 2022 15:39:53 -0700
Subject: [PATCH] Fix bug in pickling MappingProxyType in PyPy 3.7+

---
 dill/_dill.py           | 31 +++++++------------------------
 tests/test_dictviews.py |  6 +++++-
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/dill/_dill.py b/dill/_dill.py
index 5b599b30..39ebbcda 100644
--- a/dill/_dill.py
+++ b/dill/_dill.py
@@ -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):
diff --git a/tests/test_dictviews.py b/tests/test_dictviews.py
index 3bbc5d62..242ecb80 100644
--- a/tests/test_dictviews.py
+++ b/tests/test_dictviews.py
@@ -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}
@@ -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()