diff options
Diffstat (limited to 'numpy/oldnumeric')
| -rw-r--r-- | numpy/oldnumeric/compat.py | 20 | ||||
| -rw-r--r-- | numpy/oldnumeric/misc.py | 7 |
2 files changed, 21 insertions, 6 deletions
diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py index 3e1d53d0e..607dd0b90 100644 --- a/numpy/oldnumeric/compat.py +++ b/numpy/oldnumeric/compat.py @@ -95,12 +95,20 @@ def _LoadArray(fp): return m import pickle, copy -class Unpickler(pickle.Unpickler): - def load_array(self): - self.stack.append(_LoadArray(self)) - - dispatch = copy.copy(pickle.Unpickler.dispatch) - dispatch['A'] = load_array +if sys.version_info[0] >= 3: + class Unpickler(pickle.Unpickler): + # XXX: should we implement this? It's not completely straightforward + # to do. + def __init__(self, *a, **kw): + raise NotImplementedError( + "numpy.oldnumeric.Unpickler is not supported on Python 3") +else: + class Unpickler(pickle.Unpickler): + def load_array(self): + self.stack.append(_LoadArray(self)) + + dispatch = copy.copy(pickle.Unpickler.dispatch) + dispatch['A'] = load_array class Pickler(pickle.Pickler): def __init__(self, *args, **kwds): diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py index d6e0f2430..ccd47efbb 100644 --- a/numpy/oldnumeric/misc.py +++ b/numpy/oldnumeric/misc.py @@ -18,6 +18,13 @@ import math import copy import copy_reg +import sys +if sys.version_info[0] >= 3: + import copyreg + import io + StringIO = io.BytesIO + copy_reg = copyreg + from numpy import sort, clip, rank, sign, shape, putmask, allclose, size,\ choose, swapaxes, array_str, array_repr, e, pi, put, \ resize, around, concatenate, vdot, transpose, \ |