Merge pull request #96 from mamico/zopeundo-py2

fix ZopeUndo.Prefix decode on python 2

buildout.cfg

@@ -13,6 +13,8 @@ extra =
 recipe = zc.recipe.testrunner
 eggs =
     ZEO [test${buildout:extra}]
+# ZopeUndo is needed as soft-dependency for a regression test
+    ZopeUndo
 initialization =
   import os, tempfile
   try: os.mkdir('tmp')

src/ZEO/asyncio/marshal.py

@@ -157,7 +157,7 @@ def find_global(module, name):
 def server_find_global(module, name):
     """Helper for message unpickler"""
     try:
-        if module != 'ZopeUndo.Prefix':
+        if module not in ('ZopeUndo.Prefix', 'copy_reg', '__builtin__'):
             raise ImportError
         m = __import__(module, _globals, _globals, _silly)
     except ImportError as msg:

src/ZEO/tests/test_marshal.py

+import unittest
+from ZEO.asyncio.marshal import encode
+from ZEO.asyncio.marshal import pickle_server_decode
+
+try:
+    from ZopeUndo.Prefix import Prefix
+except ImportError:
+    _HAVE_ZOPE_UNDO = False
+else:
+    _HAVE_ZOPE_UNDO = True
+
+
+class MarshalTests(unittest.TestCase):
+
+    @unittest.skipUnless(_HAVE_ZOPE_UNDO, 'ZopeUndo is not installed')
+    def testServerDecodeZopeUndoFilter(self):
+        # this is an example (1) of Zope2's arguments for
+        # undoInfo call. Arguments are encoded by ZEO client
+        # and decoded by server. The operation must be idempotent.
+        # (1) https://github.com/zopefoundation/Zope/blob/2.13/src/App/Undo.py#L111
+        args = (0, 20, {'user_name': Prefix('test')})
+        # test against repr because Prefix __eq__ operator
+        # doesn't compare Prefix with Prefix but only
+        # Prefix with strings. see Prefix.__doc__
+        self.assertEqual(
+            repr(pickle_server_decode(encode(*args))),
+            repr(args)
+        )
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(MarshalTests))
+    return suite

tox.ini

@@ -21,7 +21,8 @@ deps =
     zope.testing
     zope.testrunner
     mock
-
+# ZopeUndo is needed as soft-dependency for a regression test
+    ZopeUndo
 [testenv:simple]
 # Test that 'setup.py test' works
 basepython =