diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 12:21:42 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 08:57:45 -0600 |
| commit | c879ad8a39f2b74edcdaa05a2f2f854fb235537d (patch) | |
| tree | 378c562ff234193cc7391a0f89095b693f42a42e /numpy/compat | |
| parent | 3f2c789ffd0d2e05596b15ea6cd644262f96200e (diff) | |
| download | numpy-c879ad8a39f2b74edcdaa05a2f2f854fb235537d.tar.gz | |
2to3: Apply types fixer.
Python 3 removes the builtin types from the types module. The types
fixer replaces such references with the builtin types where possible
and also takes care of some special cases:
types.TypeNone <- type(None)
types.NotImplementedType <- type(NotImplemented)
types.EllipsisType <- type(Ellipsis)
The only two tricky substitutions are
types.StringType <- bytes
types.LongType <- int
These are fixed up to support both Python 3 and Python 2 code by
importing the long and bytes types from numpy.compat.
Closes #3240.
Diffstat (limited to 'numpy/compat')
| -rw-r--r-- | numpy/compat/_inspect.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/compat/_inspect.py b/numpy/compat/_inspect.py index 557a3da32..6a499e727 100644 --- a/numpy/compat/_inspect.py +++ b/numpy/compat/_inspect.py @@ -151,7 +151,7 @@ def joinseq(seq): def strseq(object, convert, join=joinseq): """Recursively walk a sequence, stringifying each element.""" - if type(object) in [types.ListType, types.TupleType]: + if type(object) in [list, tuple]: return join([strseq(_o, convert, join) for _o in object]) else: return convert(object) |