diff options
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/memmap.py | 2 | ||||
| -rw-r--r-- | numpy/core/numeric.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/memmap.py b/numpy/core/memmap.py index 0ac153a74..a4f049f2c 100644 --- a/numpy/core/memmap.py +++ b/numpy/core/memmap.py @@ -7,7 +7,7 @@ import sys import numpy as np from .numeric import uint8, ndarray, dtype -from numpy.compat import long +from numpy.compat import long, basestring dtypedescr = dtype valid_filemodes = ["r", "c", "r+", "w+"] diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index f1cdb0409..d689982db 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2,15 +2,16 @@ from __future__ import division, absolute_import, print_function import sys import warnings +import collections from . import multiarray from . import umath from .umath import * from . import numerictypes from .numerictypes import * -import collections if sys.version_info[0] >= 3: import pickle + basestring = str else: import cPickle as pickle |