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/compat/py3k.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/compat/py3k.py')
| -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 |