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/compat | |
| 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/compat')
| -rw-r--r-- | numpy/compat/py3k.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py index f45a9973f..ce79edde8 100644 --- a/numpy/compat/py3k.py +++ b/numpy/compat/py3k.py @@ -6,14 +6,16 @@ from __future__ import division, absolute_import, print_function __all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar', 'unicode', 'asunicode', 'asbytes_nested', 'asunicode_nested', - 'asstr', 'open_latin1', 'long'] + 'asstr', 'open_latin1', 'long', 'basestring'] import sys if sys.version_info[0] >= 3: import io + long = int integer_types = (int,) + basestring = str bytes = bytes unicode = str @@ -45,6 +47,7 @@ else: bytes = str unicode = unicode long = long + basestring = basestring integer_types = (int, long) asbytes = str asstr = str |