summaryrefslogtreecommitdiff
path: root/numpy/core/defchararray.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-13 07:00:11 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-04-13 07:00:11 -0700
commit688bc60658b391524c6b641e0a5e5ecd73322d02 (patch)
tree1b210bb7361ce691e781884bf06f89c7ebd13360 /numpy/core/defchararray.py
parent74b08b3f0284d9d2dd55a15dd98a3846913b1b51 (diff)
parent7f5af37e26ba2e99ad3ee6928b78437f601e96e0 (diff)
downloadnumpy-688bc60658b391524c6b641e0a5e5ecd73322d02.tar.gz
Merge pull request #3232 from charris/2to3-apply-numliterals-fixer
2to3: Apply the `numliterals` fixer and skip the `long` fixer.
Diffstat (limited to 'numpy/core/defchararray.py')
-rw-r--r--numpy/core/defchararray.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py
index d5acb1e97..874a295ef 100644
--- a/numpy/core/defchararray.py
+++ b/numpy/core/defchararray.py
@@ -22,7 +22,7 @@ from .numerictypes import string_, unicode_, integer, object_, bool_, character
from .numeric import ndarray, compare_chararrays
from .numeric import array as narray
from numpy.core.multiarray import _vec_string
-from numpy.compat import asbytes
+from numpy.compat import asbytes, long
import numpy
__all__ = ['chararray',