diff options
author | INADA Naoki <methane@users.noreply.github.com> | 2014-11-14 16:24:11 +0900 |
---|---|---|
committer | INADA Naoki <methane@users.noreply.github.com> | 2014-11-14 16:24:11 +0900 |
commit | 547a668ad6ffa9797e6b69c491f423d5522d1c38 (patch) | |
tree | 81a402e4d36d72a14b6fc1c41ec7bde15cefea70 | |
parent | ef3f94101aca6dd41a75c3ddc51762d9e8bb3a83 (diff) | |
parent | d5e9ac93162e3ea846be8862b54267fe9616f72b (diff) | |
download | msgpack-python-547a668ad6ffa9797e6b69c491f423d5522d1c38.tar.gz |
Merge pull request #110 from JasonXJ/master
add support for pypy3
-rw-r--r-- | msgpack/fallback.py | 5 | ||||
-rw-r--r-- | tox.ini | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/msgpack/fallback.py b/msgpack/fallback.py index 8ab3ad2..71fa7be 100644 --- a/msgpack/fallback.py +++ b/msgpack/fallback.py @@ -23,7 +23,10 @@ if hasattr(sys, 'pypy_version_info'): # cStringIO is slow on PyPy, StringIO is faster. However: PyPy's own # StringBuilder is fastest. from __pypy__ import newlist_hint - from __pypy__.builders import StringBuilder + try: + from __pypy__.builders import BytesBuilder as StringBuilder + except ImportError: + from __pypy__.builders import StringBuilder USING_STRINGBUILDER = True class StringIO(object): def __init__(self, s=b''): @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py32,py33,py34,pypy +envlist = py26,py27,py32,py33,py34,pypy,pypy3 [testenv] deps= |