Merge pull request #3257 from charris/2to3-apply-unicode-fixer

2to3: Apply unicode fixer.

1 files changed, 10 insertions, 5 deletions

diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 2154acdce..6a353762b 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -14,12 +14,17 @@ from operator import itemgetter
 from ._datasource import DataSource
 from ._compiled_base import packbits, unpackbits
 
-from ._iotools import LineSplitter, NameValidator, StringConverter, \
-                     ConverterError, ConverterLockError, ConversionWarning, \
-                     _is_string_like, has_nested_fields, flatten_dtype, \
-                     easy_dtype, _bytes_to_name
+from ._iotools import (
+        LineSplitter, NameValidator, StringConverter,
+        ConverterError, ConverterLockError, ConversionWarning,
+        _is_string_like, has_nested_fields, flatten_dtype,
+        easy_dtype, _bytes_to_name
+        )
+
+from numpy.compat import (
+        asbytes, asstr, asbytes_nested, bytes, basestring, unicode
+        )
 
-from numpy.compat import asbytes, asstr, asbytes_nested, bytes, basestring
 from io import BytesIO
 
 if sys.version_info[0] >= 3: