diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2020-08-28 09:46:51 +0100 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2020-08-28 13:55:13 +0100 |
| commit | d3e4792a6ef9532825d481586dc38c0e2e1eb53b (patch) | |
| tree | f01e97430ba8ef09afa331b2ace701f2f1653f68 /doc/source/reference | |
| parent | 80701dda0fd7b16ecccc2243e9a0c5f00194fef6 (diff) | |
| download | numpy-d3e4792a6ef9532825d481586dc38c0e2e1eb53b.tar.gz | |
ENH: Allow μs as an alias for us
This is motivated primarily as a proof that the datetime API is now unicode-safe, and generally seems harmless.
Diffstat (limited to 'doc/source/reference')
| -rw-r--r-- | doc/source/reference/arrays.datetime.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/source/reference/arrays.datetime.rst b/doc/source/reference/arrays.datetime.rst index 9ce77424a..c5947620e 100644 --- a/doc/source/reference/arrays.datetime.rst +++ b/doc/source/reference/arrays.datetime.rst @@ -218,7 +218,7 @@ And here are the time units: m minute +/- 1.7e13 years [1.7e13 BC, 1.7e13 AD] s second +/- 2.9e11 years [2.9e11 BC, 2.9e11 AD] ms millisecond +/- 2.9e8 years [ 2.9e8 BC, 2.9e8 AD] - us microsecond +/- 2.9e5 years [290301 BC, 294241 AD] +us / μs microsecond +/- 2.9e5 years [290301 BC, 294241 AD] ns nanosecond +/- 292 years [ 1678 AD, 2262 AD] ps picosecond +/- 106 days [ 1969 AD, 1970 AD] fs femtosecond +/- 2.6 hours [ 1969 AD, 1970 AD] |