diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 09:05:31 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 09:05:31 -0600 |
| commit | 68338eed3ae91c9846142e088c16b63635e58178 (patch) | |
| tree | adaec2f35174f838edbc932921eccac10c7c3886 /numpy/ma/core.py | |
| parent | 688bc60658b391524c6b641e0a5e5ecd73322d02 (diff) | |
| download | numpy-68338eed3ae91c9846142e088c16b63635e58178.tar.gz | |
2to3: Apply basestring fixer.
The basestring class is not defined in Python 3 and the fixer replaces
it with str. In order to have a common code base we define basestring in
numpy/compat/py3k.py to be str when the Python version is >= 3,
otherwise basestring and import it where needed. That works for most
cases, but there are a few files where the version dependent define
needs to be in the file.
Closes #3042.
Diffstat (limited to 'numpy/ma/core.py')
| -rw-r--r-- | numpy/ma/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 23b60ee8c..fda5e86dc 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -32,7 +32,7 @@ import numpy.core.numerictypes as ntypes from numpy import ndarray, amax, amin, iscomplexobj, bool_ from numpy import array as narray from numpy.lib.function_base import angle -from numpy.compat import getargspec, formatargspec, long +from numpy.compat import getargspec, formatargspec, long, basestring from numpy import expand_dims as n_expand_dims if sys.version_info[0] >= 3: |