Merge pull request #159 from zopefoundation/zodb-pr207

Fix tests with ZODB >= 5.6.0.

.gitignore

@@ -7,9 +7,12 @@ bin
 develop-eggs
 eggs
 parts
+pyvenv.cfg
 testing.log
 .dir-locals.el
 data.fs*
 ZEO_forker*.conf
 .eggs/
 doc/_build
+lib/
+lib64

.travis.yml

@@ -5,8 +5,6 @@ matrix:
           python: 2.7
         - os: linux
           python: pypy
-        - os: linux
-          python: 3.4
         - os: linux
           python: 3.5
         - os: linux

CHANGES.rst

@@ -4,6 +4,8 @@ Changelog
 5.2.2 (unreleased)
 ------------------
 
+- Remove support for Python 3.4
+
 - Provide proper CA test certificates to allow the SSL tests succeed for Py3
 
 - Replace deprecated occurences of ``Thread.isAlive()`` by ``Thread.is_alive()``

setup.py

@@ -35,7 +35,7 @@ tests_require = [
     'manuel',
     'random2',
     'mock',
-    'msgpack < 0.6',
+    'msgpack < 1',
     'zope.testrunner',
 ]
 
@@ -45,7 +45,6 @@ License :: OSI Approved :: Zope Public License
 Programming Language :: Python :: 2
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
@@ -157,5 +156,5 @@ setup(name="ZEO",
       zeo-nagios = ZEO.nagios:main
       """,
       include_package_data=True,
-      python_requires='>=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
+      python_requires='>=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
 )

src/ZEO/asyncio/marshal.py

@@ -66,7 +66,7 @@ def decoder(protocol):
         from msgpack import unpackb
         def msgpack_decode(data):
             """Decodes msg and returns its parts"""
-            return unpackb(data, encoding='utf-8', use_list=False)
+            return unpackb(data, raw=False, use_list=False)
         return msgpack_decode
     else:
         assert protocol[:1] == b'Z'
@@ -126,7 +126,10 @@ _silly = ('__doc__',)
 
 exception_type_type = type(Exception)
 
-_SAFE_MODULE_NAMES = ('ZopeUndo.Prefix', 'copy_reg', '__builtin__', 'zodbpickle')
+_SAFE_MODULE_NAMES = (
+    'ZopeUndo.Prefix', 'zodbpickle',
+    'builtins', 'copy_reg', '__builtin__',
+)
 
 def find_global(module, name):
     """Helper for message unpickler"""

src/ZEO/tests/ZEO4/zrpc/marshal.py

@@ -97,7 +97,10 @@ _silly = ('__doc__',)
 
 exception_type_type = type(Exception)
 
-_SAFE_MODULE_NAMES = ('ZopeUndo.Prefix', 'copy_reg', '__builtin__', 'zodbpickle')
+_SAFE_MODULE_NAMES = (
+    'ZopeUndo.Prefix', 'zodbpickle',
+    'builtins', 'copy_reg', '__builtin__',
+)
 
 def find_global(module, name):
     """Helper for message unpickler"""

src/ZEO/tests/testZEO.py

@@ -489,6 +489,8 @@ class FileStorageHexTests(FileStorageTests):
 
 class FileStorageClientHexTests(FileStorageHexTests):
 
+    use_extension_bytes = True
+
     def getConfig(self):
         return """\
         %import ZODB.tests

tox.ini

 [tox]
 envlist =
-    py27,py34,py35,py36,py37,pypy,pypy3,simple,docs
+    py27,py35,py36,py37,pypy,pypy3,simple,docs
 
 [testenv]
 commands =
@@ -21,19 +21,21 @@ deps =
     zope.testing
     zope.testrunner
     mock
-    msgpack
+    msgpack < 1
 # ZopeUndo is needed as soft-dependency for a regression test
     ZopeUndo
+
 [testenv:simple]
 # Test that 'setup.py test' works
 basepython =
-    python3.4
+    python3.6
 commands =
     python setup.py -q test -q
 deps = {[testenv]deps}
+
 [testenv:docs]
 basepython =
-    python3.8
+    python3.6
 commands =
     sphinx-build -b html doc doc/_build/html
 extras =