diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2023-05-13 11:02:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 11:02:49 -0600 |
| commit | 5187067d7ad176ee3614beab2b99a524dd719aa8 (patch) | |
| tree | 907997d0c294f550193322aaa73237c1a7bcfaa6 /numpy/core/_dtype.py | |
| parent | b786189222ac5bf2f4efbb04399261f7f760bc18 (diff) | |
| parent | 81caed6e3c34c4bf4b22b4f6167e816ba2a3f73c (diff) | |
| download | numpy-5187067d7ad176ee3614beab2b99a524dd719aa8.tar.gz | |
Merge branch 'main' into deprecate-find-common-type
Diffstat (limited to 'numpy/core/_dtype.py')
| -rw-r--r-- | numpy/core/_dtype.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/numpy/core/_dtype.py b/numpy/core/_dtype.py index 3db80c17e..ff50f5199 100644 --- a/numpy/core/_dtype.py +++ b/numpy/core/_dtype.py @@ -114,13 +114,13 @@ def _scalar_str(dtype, short): # platforms, so it should never include the itemsize here. return "'O'" - elif dtype.type == np.string_: + elif dtype.type == np.bytes_: if _isunsized(dtype): return "'S'" else: return "'S%d'" % dtype.itemsize - elif dtype.type == np.unicode_: + elif dtype.type == np.str_: if _isunsized(dtype): return "'%sU'" % byteorder else: @@ -334,6 +334,8 @@ def _name_includes_bit_suffix(dtype): elif dtype.type == np.bool_: # implied return False + elif dtype.type is None: + return True elif np.issubdtype(dtype, np.flexible) and _isunsized(dtype): # unspecified return False @@ -348,7 +350,9 @@ def _name_get(dtype): # user dtypes don't promise to do anything special return dtype.type.__name__ - if issubclass(dtype.type, np.void): + if dtype.kind == '\x00': + name = type(dtype).__name__ + elif issubclass(dtype.type, np.void): # historically, void subclasses preserve their name, eg `record64` name = dtype.type.__name__ else: |