[pypy-commit] pypy default: fix testing cPickle on cpython
bdkearns
noreply at buildbot.pypy.org
Sat Mar 16 01:26:49 CET 2013
Author: Brian Kearns <bdkearns at gmail.com>
Branch:
Changeset: r62365:706f2784ba43
Date: 2013-03-15 20:25 -0400
http://bitbucket.org/pypy/pypy/changeset/706f2784ba43/
Log: fix testing cPickle on cpython
diff --git a/lib_pypy/cPickle.py b/lib_pypy/cPickle.py
--- a/lib_pypy/cPickle.py
+++ b/lib_pypy/cPickle.py
@@ -2,7 +2,7 @@
# Reimplementation of cPickle, mostly as a copy of pickle.py
#
-from pickle import Pickler, dump, dumps, PickleError, PicklingError, UnpicklingError, _EmptyClass, StringBuilderFile
+from pickle import Pickler, dump, dumps, PickleError, PicklingError, UnpicklingError, _EmptyClass
from pickle import __doc__, __version__, format_version, compatible_formats
from types import *
from copy_reg import dispatch_table
@@ -96,6 +96,11 @@
# closer to the ones produced by cPickle in CPython
from pickle import StringIO
+try:
+ from pickle import StringBuilderFile
+except ImportError:
+ assert '__pypy__' not in sys.builtin_module_names
+ from pickle import StringIO as StringBuilderFile
PythonPickler = Pickler
class Pickler(PythonPickler):
More information about the pypy-commit
mailing list