diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 07:15:26 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 07:15:26 -0700 |
| commit | 01ed88af5b784d52f4fcf383e319cde67c8a22fb (patch) | |
| tree | 91736aafb0da995afee4170619196a87b4177f02 /numpy/core/numeric.py | |
| parent | e589c6ed1dac7755bb7bd9e181a43ebeff62dcec (diff) | |
| parent | 68338eed3ae91c9846142e088c16b63635e58178 (diff) | |
| download | numpy-01ed88af5b784d52f4fcf383e319cde67c8a22fb.tar.gz | |
Merge pull request #3237 from charris/2to3-apply-basestring
2to3: Apply basestring fixer.
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 3 |
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 |