Tests for errors='bytes'

src/zodbpickle/tests/pickletester.py

@@ -1258,6 +1258,19 @@ def test_load_long_str_protocol_1(self):
                 b'T,\x01\x00\x00xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxq\x00.',
                 b'x'*300)
 
+class AbstractBytesFallbackTests:
+    def unpickleEqual(self, data, unpickled):
+        loaded = self.loads(data, errors="bytes")
+        self.assertEqual(loaded, unpickled)
+
+    def test_load_instance(self):
+        r"""Test instance pickle.
+
+        Python 2: pickle.dumps({'x': 'ascii', 'y': '\xff'}) """
+        self.unpickleEqual(
+                b"(dp0\nS'y'\np1\nS'\\xff'\np2\nsS'x'\np3\nS'ascii'\np4\ns.",
+                {'x': 'ascii', 'y': b'\xff'})
+
 class BigmemPickleTests:
 
     # Binary protocols can serialize longs of up to 2GB-1

src/zodbpickle/tests/test_pickle.py

@@ -11,6 +11,7 @@
 from .pickletester import AbstractDispatchTableTests
 from .pickletester import BigmemPickleTests
 from .pickletester import AbstractBytestrTests
+from .pickletester import AbstractBytesFallbackTests
 
 from zodbpickle import pickle
 
@@ -49,6 +50,10 @@ class PyPicklerBytestrTests(PyPicklerBase, AbstractBytestrTests,
                             unittest.TestCase):
     pass
 
+class PyPicklerBytesFallbackTests(PyPicklerBase, AbstractBytesFallbackTests,
+                                  unittest.TestCase):
+    pass
+
 class InMemoryPickleTests(AbstractPickleTests, BigmemPickleTests,
                           unittest.TestCase):
 
@@ -113,6 +118,10 @@ class CPicklerBytestrTests(PyPicklerBytestrTests):
         pickler = _pickle.Pickler
         unpickler = _pickle.Unpickler
 
+    class CPicklerBytesFallbackTests(PyPicklerBytesFallbackTests):
+        pickler = _pickle.Pickler
+        unpickler = _pickle.Unpickler
+
     class CPersPicklerTests(PyPersPicklerTests):
         pickler = _pickle.Pickler
         unpickler = _pickle.Unpickler
@@ -143,9 +152,10 @@ def get_dispatch_table(self):
 def test_main():
     tests = [PickleTests, PyPicklerTests, PyPersPicklerTests,
              PyDispatchTableTests, PyChainDispatchTableTests,
-             PyPicklerBytestrTests]
+             PyPicklerBytestrTests, PyPicklerBytesFallbackTests]
     if has_c_implementation:
-        tests.extend([CPicklerTests, CPicklerBytestrTests, CPersPicklerTests,
+        tests.extend([CPicklerTests, CPicklerBytestrTests,
+                      CPicklerBytesFallbackTests, CPersPicklerTests,
                       CDumpPickle_LoadPickle, DumpPickle_CLoadPickle,
                       PyPicklerUnpicklerObjectTests,
                       CPicklerUnpicklerObjectTests,