8000 Merge pull request #110 from JasonXJ/master · didlie/msgpack-python@547a668 · GitHub
[go: up one dir, main page]

Skip to content

Commit 547a668

Browse files
committed
Merge pull request msgpack#110 from JasonXJ/master
add support for pypy3
2 parents ef3f941 + d5e9ac9 commit 547a668

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

msgpack/fallback.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ def dict_iteritems(d):
2323
# cStringIO is slow on PyPy, StringIO is faster. However: PyPy's own
2424
# StringBuilder is fastest.
2525
from __pypy__ import newlist_hint
26-
from __pypy__.builders import StringBuilder
26+
try:
27+
from __pypy__.builders import BytesBuilder as StringBuilder
28+
except ImportError:
29+
from __pypy__.builders import StringBuilder
2730
USING_STRINGBUILDER = True
2831
class StringIO(object):
2932
def __init__(self, s=b''):

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26,py27,py32,py33,py34,pypy
2+
envlist = py26,py27,py32,py33,py34,pypy,pypy3
33

44
[testenv]
55
deps=

0 commit comments

Comments
 (0)
0