diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2019-11-11 23:05:31 +0000 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2019-11-13 21:45:50 +0000 |
| commit | 6dfe3318400972f414b02e3e12c83c52372f1e00 (patch) | |
| tree | f05556eace312e4a86b8e7bbd865a75a4b199fc5 /numpy/lib/npyio.py | |
| parent | 231f59daab0e8ea222a21d524817b2eeb46b9cd7 (diff) | |
| download | numpy-6dfe3318400972f414b02e3e12c83c52372f1e00.tar.gz | |
MAINT: Remove uses of scalar aliases
Relates to gh-6103
Diffstat (limited to 'numpy/lib/npyio.py')
| -rw-r--r-- | numpy/lib/npyio.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 7e1d4db4f..430d44374 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -1529,9 +1529,9 @@ def fromregex(file, regexp, dtype, encoding=None): dtype = np.dtype(dtype) content = file.read() - if isinstance(content, bytes) and isinstance(regexp, np.unicode): + if isinstance(content, bytes) and isinstance(regexp, np.compat.unicode): regexp = asbytes(regexp) - elif isinstance(content, np.unicode) and isinstance(regexp, bytes): + elif isinstance(content, np.compat.unicode) and isinstance(regexp, bytes): regexp = asstr(regexp) if not hasattr(regexp, 'match'): |