Fix Marco-Sulla#87

src/frozendict/_frozendictpy.py

@@ -235,6 +235,7 @@ def frozendict_reversed(self, *args, **kwargs):
 frozendict.update = immutable
 frozendict.__delattr__ = immutable
 frozendict.__setattr__ = immutable
+frozendict.__module__ = 'frozendict'
 
 _sentinel = object()
 out_of_range_err_tpl = "{name} index {index} out of max range {sign}{maxpos}"

src/frozendict/core.py

@@ -0,0 +1,4 @@
+# this provides compatibility for older pickles
+# created on a python-only implementation that
+# specifically mention frozendict.core.frozendict
+from frozendict import frozendict

test/base.py

@@ -134,4 +134,12 @@ def module_prefix(self):
             return ""
 
         return "frozendict."
-
+
+    @pytest.fixture
+    def module_patch(self, monkeypatch):
+        import frozendict
+
+        if self.is_subclass or not frozendict.c_ext:
+            return
+
+        monkeypatch.setattr(frozendict, 'frozendict', self.FrozendictClass)

test/common.py

@@ -108,10 +108,12 @@ def test_equals_dict(self, fd, fd_dict):
         assert fd == fd_dict
 
     @pytest.mark.parametrize("protocol", range(pickle.HIGHEST_PROTOCOL + 1))
-    def test_pickle(self, fd, protocol):
+    def test_pickle(self, fd, protocol, module_patch):
         dump = pickle.dumps(fd, protocol=protocol)
         assert dump
         assert pickle.loads(dump) == fd
+        assert b'core' not in dump
+        assert b'_frozendictpy' not in dump
 
     def test_constructor_iterator(self, fd, fd_items):
         assert self.FrozendictClass(fd_items) == fd
@@ -257,14 +259,14 @@ def test_xor_items(self, fd, fd_dict, fd2, fd_dict_2):
         assert fd.items() ^ fd2.items() == res
 
     @pytest.mark.parametrize("protocol", range(pickle.HIGHEST_PROTOCOL + 1))
-    def test_pickle_iter_key(self, fd, protocol):
+    def test_pickle_iter_key(self, fd, protocol, module_patch):
         orig = iter(fd.keys())
         dump = pickle.dumps(orig, protocol=protocol)
         assert dump
         assert tuple(pickle.loads(dump)) == tuple(orig)
 
     @pytest.mark.parametrize("protocol", range(pickle.HIGHEST_PROTOCOL + 1))
-    def test_pickle_iter_item(self, fd, protocol):
+    def test_pickle_iter_item(self, fd, protocol, module_patch):
         orig = iter(fd.items())
         dump = pickle.dumps(orig, protocol=protocol)
         assert dump

test/frozendict_only.py

@@ -1,3 +1,4 @@
+import pickle
 import pytest
 from copy import copy, deepcopy
 from .base import FrozendictTestBase
@@ -41,3 +42,11 @@ def test_init(self, fd):
     def test_del_empty(self):
         fd = self.FrozendictClass({1: 2})
         assert fd.delete(1) is self.FrozendictClass()
+
+    def test_load_core_pickle(self):
+        obj = pickle.loads(b'cfrozendict.core\nfrozendict\np0\n((dp1\nVa\np2\nI1\nstp3\nRp4\n.')
+        assert obj == {'a': 1}
+
+    def test_load_non_core_pickle(self):
+        obj = pickle.loads(b'cfrozendict\nfrozendict\np0\n((dp1\nVa\np2\nI1\nstp3\nRp4\n.')
+        assert obj == {'a': 1}