diff options
| author | Matti Picus <matti.picus@gmail.com> | 2019-11-14 05:40:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 05:40:34 -0700 |
| commit | d1d9dd58e2de5f3b69c02b104e1daaeec1f38d9f (patch) | |
| tree | ee22f87b400326a4f0fff79e185036783b4c8b80 /numpy/lib/npyio.py | |
| parent | fae5473ee1569011cf56eda9d6f3a5067258b3ec (diff) | |
| parent | 6dfe3318400972f414b02e3e12c83c52372f1e00 (diff) | |
| download | numpy-d1d9dd58e2de5f3b69c02b104e1daaeec1f38d9f.tar.gz | |
Merge pull request #14901 from eric-wieser/remove-uses-of-scalar-aliases
MAINT: Remove uses of scalar aliases
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'): |