summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py3
1 files changed, 2 insertions, 1 deletions
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