From e975168a90027794be99e221b33e8a4a94bdf434 Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Sun, 21 Feb 2010 02:49:39 +0000 Subject: 3K: ENH: make oldnumeric to import -- but don't implement oldnumeric.Unpickler as it's not straightforward to do --- numpy/oldnumeric/compat.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'numpy/oldnumeric/compat.py') 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): -- cgit v1.2.1