8000 ENH: Add aliases for common scalar unions by BvB93 · Pull Request #17096 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: Add aliases for common scalar unions #17096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

ENH: Add aliases for common scalar unions #17096

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8f0d11
MAINT: Add aliases for common scalar unions
Aug 18, 2020
1a2406a
ENH,MAINT: Added `_ScalarType`; made `ArrayLike` a typevar
Aug 18, 2020
1013f4a
MAINT: Added an `_ArrayLikeNested` type to the `ArrayLike` union
Aug 18, 2020
b66d959
ENH: made `ArrayLike` a typevar
Aug 18, 2020
6fce65a
REV: Revert adding a typevar to `ArrayLike`
Aug 18, 2020
69c9c93
ENH: Use `_ScalarLike` in the definition of `ArrayLike`
Aug 18, 2020
fff6734
ENH: Be more specific about `_ScalarLike` and `_VoidLike`
Aug 18, 2020
0771d80
ENH: Ensure that `np.integer` (and `np.floating`) are valid values fo…
Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ENH: Be more specific about _ScalarLike and _VoidLike
  • Loading branch information
Bas van Beek committed Aug 18, 2020
commit fff6734772090f96961d1eab2045f68fa3e468c1
19 changes: 14 additions & 5 deletions numpy/typing/_scalars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Union
from typing import Union, Tuple, Any
from datetime import datetime, timedelta

import numpy as np
Expand All @@ -16,9 +16,18 @@
_BytesLike = Union[bytes, np.bytes_]
_CharacterLike = Union[str, bytes, np.character]

# _VoidLike is technically not a scalar, but it's close enough
_VoidLike = Union[tuple, np.void]

_VoidLikeNested = Any # TODO: wait for support for recursive types
_ScalarLike = Union[
datetime, timedelta, int, float, complex, str, bytes, tuple, np.generic
datetime,
timedelta,
int,
float,
complex,
str,
bytes,
Tuple[_VoidLikeNested, ...],
np.generic,
]

# _VoidLike is technically not a scalar, but it's close enough
_VoidLike = Union[Tuple[_ScalarLike, ...], np.void]
0