diff --git a/.travis.yml b/.travis.yml index b68c370..8a4b642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: python python: - - "3.3" - - "3.4" - "3.5" - "3.6" + - "3.7" + - "3.8" env: - EXTRAS="N" diff --git a/serialize/msgpack.py b/serialize/msgpack.py index 54752b5..0d14fa6 100644 --- a/serialize/msgpack.py +++ b/serialize/msgpack.py @@ -25,6 +25,6 @@ def dumps(obj): def loads(content): - return msgpack.unpackb(content, object_hook=all.decode, encoding='utf-8') + return msgpack.unpackb(content, object_hook=all.decode, raw=False) all.register_format('msgpack', dumps, loads) diff --git a/serialize/pickle.py b/serialize/pickle.py index 16f1dd9..0ba83e8 100644 --- a/serialize/pickle.py +++ b/serialize/pickle.py @@ -11,7 +11,7 @@ :license: BSD, see LICENSE for more details. """ -import collections +from collections.abc import MutableMapping from . import all @@ -23,7 +23,7 @@ raise -class DispatchTable(collections.MutableMapping): +class DispatchTable(MutableMapping): def __getitem__(self, item): if item in all.CLASSES: diff --git a/setup.py b/setup.py index 6333b4b..02d0a8f 100644 --- a/setup.py +++ b/setup.py @@ -45,9 +45,8 @@ def read(filename): 'Operating System :: POSIX', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ])