Improve support for old pickles.

1 files changed, 5 insertions, 18 deletions

diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py
index 9d5810a13..d6e0f2430 100644
--- a/numpy/oldnumeric/misc.py
+++ b/numpy/oldnumeric/misc.py
@@ -1,15 +1,15 @@
 # Functions that already have the correct syntax or miscellaneous functions
 
 
-__all__ = ['load', 'sort', 'copy_reg', 'clip', 'Unpickler', 'rank',
+__all__ = ['sort', 'copy_reg', 'clip', 'rank',
            'sign', 'shape', 'types', 'allclose', 'size',
            'choose', 'swapaxes', 'array_str',
            'pi', 'math', 'concatenate', 'putmask', 'put',
            'around', 'vdot', 'transpose', 'array2string', 'diagonal',
            'searchsorted', 'copy', 'resize',
            'array_repr', 'e', 'StringIO', 'pickle',
-           'argsort', 'convolve', 'loads', 'cross_correlate',
-           'Pickler', 'dot', 'outerproduct', 'innerproduct', 'insert']
+           'argsort', 'convolve', 'cross_correlate',
+           'dot', 'outerproduct', 'innerproduct', 'insert']
 
 import types
 import StringIO
@@ -17,26 +17,13 @@ import pickle
 import math
 import copy
 import copy_reg
-from pickle import load, loads
 
 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, \
      diagonal, searchsorted, argsort, convolve, dot, \
-     outer as outerproduct, inner as innerproduct, correlate as cross_correlate, \
+     outer as outerproduct, inner as innerproduct, \
+     correlate as cross_correlate, \
      place as insert
 
 from array_printer import array2string
-
-
-class Unpickler(pickle.Unpickler):
-    def __init__(self, *args, **kwds):
-        raise NotImplementedError
-    def load_array(self):
-        raise NotImplementedError
-
-class Pickler(pickle.Pickler):
-    def __init__(self, *args, **kwds):
-        raise NotImplementedError
-    def save_array(self, object):
-        raise NotImplementedError