diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-06-10 09:28:25 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-10 09:28:25 -0600 |
| commit | 45fe03ba88235f67ead8e3b3c36b737439bb75c8 (patch) | |
| tree | d28ef57f92474dab0426d727c937da0a23b98aca | |
| parent | 2125eca12ba5a2e3c39128f505eadceda0203543 (diff) | |
| parent | caab62bce506dc8aaaec1df8c85af8785bcef020 (diff) | |
| download | numpy-45fe03ba88235f67ead8e3b3c36b737439bb75c8.tar.gz | |
Merge pull request #11293 from cwenner/feat/doc-numericaltypes-hierarchy
DOC: fix hierarchy of numericaltype
| -rw-r--r-- | numpy/core/numerictypes.py | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index aa91ecb44..f7f25dd95 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -41,43 +41,42 @@ Exported symbols include: generic +-> bool_ (kind=b) - +-> number (kind=i) - | integer - | signedinteger (intxx) - | byte - | short - | intc - | intp int0 - | int_ - | longlong - +-> unsignedinteger (uintxx) (kind=u) - | ubyte - | ushort - | uintc - | uintp uint0 - | uint_ - | ulonglong - +-> inexact - | +-> floating (floatxx) (kind=f) - | | half - | | single - | | float_ (double) - | | longfloat - | \\-> complexfloating (complexxx) (kind=c) - | csingle (singlecomplex) - | complex_ (cfloat, cdouble) - | clongfloat (longcomplex) + +-> number + | +-> integer + | | +-> signedinteger (intxx) (kind=i) + | | | byte + | | | short + | | | intc + | | | intp int0 + | | | int_ + | | | longlong + | | \\-> unsignedinteger (uintxx) (kind=u) + | | ubyte + | | ushort + | | uintc + | | uintp uint0 + | | uint_ + | | ulonglong + | +-> inexact + | +-> floating (floatxx) (kind=f) + | | half + | | single + | | float_ (double) + | | longfloat + | \\-> complexfloating (complexxx) (kind=c) + | csingle (singlecomplex) + | complex_ (cfloat, cdouble) + | clongfloat (longcomplex) +-> flexible - | character - | void (kind=V) - | - | str_ (string_, bytes_) (kind=S) [Python 2] - | unicode_ (kind=U) [Python 2] - | - | bytes_ (string_) (kind=S) [Python 3] - | str_ (unicode_) (kind=U) [Python 3] - | - \\-> object_ (not used much) (kind=O) + | +-> character + | | str_ (string_, bytes_) (kind=S) [Python 2] + | | unicode_ (kind=U) [Python 2] + | | + | | bytes_ (string_) (kind=S) [Python 3] + | | str_ (unicode_) (kind=U) [Python 3] + | | + | \\-> void (kind=V) + \\-> object_ (not used much) (kind=O) """ from __future__ import division, absolute_import, print_function |