diff options
| author |   Brian Kearns <bdkearns@gmail.com> | 2013-03-20 20:32:14 -0400 |
|---|---|---|
| committer | Brian Kearns <bdkearns@gmail.com> | 2013-03-20 20:32:14 -0400 |
| commit | a06bcc0f100e89f07659893fa2b4536126d491b8 (patch) | |
| tree | 88551b57b1b370a7600a79d36ec32e05c192f221 /lib_pypy/cPickle.py | |
| parent | removed a C file that was unused (diff) | |
| download | pypy-a06bcc0f100e89f07659893fa2b4536126d491b8.tar.gz pypy-a06bcc0f100e89f07659893fa2b4536126d491b8.tar.bz2 pypy-a06bcc0f100e89f07659893fa2b4536126d491b8.zip | |
clean up the pickle StringBuilder modifications
Diffstat (limited to 'lib_pypy/cPickle.py')
| -rw-r--r-- | lib_pypy/cPickle.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib_pypy/cPickle.py b/lib_pypy/cPickle.py index 1d2512dfc6..e1a8682074 100644 --- a/lib_pypy/cPickle.py +++ b/lib_pypy/cPickle.py @@ -96,18 +96,18 @@ _tuplesize2code = [EMPTY_TUPLE, TUPLE1, TUPLE2, TUPLE3] # 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 + StringBuilderFile = StringIO PythonPickler = Pickler class Pickler(PythonPickler): def __init__(self, *args, **kw): self.__f = None if len(args) == 1 and isinstance(args[0], int): - self.__f = StringIO() + self.__f = StringBuilderFile() PythonPickler.__init__(self, self.__f, args[0], **kw) else: PythonPickler.__init__(self, *args, **kw) |