Skip to content

TYP: Adjust type hint of Norm.__call__ to return masked array #26434

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

Merged
QuLogic merged 2 commits into from
Aug 3, 2023
Merged

TYP: Adjust type hint of Norm.__call__ to return masked array #26434

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47d155d
Adjust type hint of Norm.__call__ to return masked array
ksunden Aug 2, 2023
6385edc
Use overloads for Normalize.__call__ and inverse, ensure NoNorm retur…
ksunden Aug 2, 2023
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
Use overloads for Normalize.__call__ and inverse, ensure NoNorm retur… 
…ns type consistent with superclass
  • Loading branch information
@ksunden
ksunden committed Aug 2, 2023
commit 6385edc416066902ec662b8af35363453b43f40f
4 changes: 4 additions & 0 deletions lib/matplotlib/colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2095,9 +2095,13 @@ class NoNorm(Normalize):
indices directly in a `~matplotlib.cm.ScalarMappable`.
"""
def __call__(self, value, clip=None):
if np.iterable(value):
return np.ma.array(value)
return value

def inverse(self, value):
if np.iterable(value):
return np.ma.array(value)
return value


Expand Down
22 changes: 12 additions & 10 deletions lib/matplotlib/colors.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,17 @@ class Normalize:
def clip(self, value: bool) -> None: ...
@staticmethod
def process_value(value: ArrayLike) -> tuple[np.ma.MaskedArray, bool]: ...
def __call__(self, value: ArrayLike, clip: bool | None = ...) -> np.ma.MaskedArray: ...
@overload
def __call__(self, value: float, clip: bool | None = ...) -> float: ...
@overload
def __call__(self, value: np.ndarray, clip: bool | None = ...) -> np.ma.MaskedArray: ...
@overload
def __call__(self, value: ArrayLike, clip: bool | None = ...) -> ArrayLike: ...
@overload
def inverse(self, value: float) -> float: ...
@overload
def inverse(self, value: np.ndarray) -> np.ma.MaskedArray: ...
@overload
def inverse(self, value: ArrayLike) -> ArrayLike: ...
def autoscale(self, A: ArrayLike) -> None: ...
def autoscale_None(self, A: ArrayLike) -> None: ...
Expand All @@ -161,8 +171,6 @@ class TwoSlopeNorm(Normalize):
@vcenter.setter
def vcenter(self, value: float) -> None: ...
def autoscale_None(self, A: ArrayLike) -> None: ...
def __call__(self, value: ArrayLike, clip: bool | None = ...) -> np.ma.MaskedArray: ...
def inverse(self, value: ArrayLike) -> ArrayLike: ...

class CenteredNorm(Normalize):
def __init__(
Expand Down Expand Up @@ -240,8 +248,6 @@ class PowerNorm(Normalize):
vmax: float | None = ...,
clip: bool = ...,
) -> None: ...
def __call__(self, value: ArrayLike, clip: bool | None = ...) -> np.ma.MaskedArray: ...
def inverse(self, value: ArrayLike) -> ArrayLike: ...

class BoundaryNorm(Normalize):
boundaries: np.ndarray
Expand All @@ -256,12 +262,8 @@ class BoundaryNorm(Normalize):
*,
extend: Literal["neither", "both", "min", "max"] = ...
) -> None: ...
def __call__(self, value: ArrayLike, clip: bool | None = ...) -> np.ma.MaskedArray: ...
def inverse(self, value: ArrayLike) -> ArrayLike: ...

class NoNorm(Normalize):
def __call__(self, value: ArrayLike, clip: bool | None = ...) -> np.ma.MaskedArray: ...
def inverse(self, value: ArrayLike) -> ArrayLike: ...
class NoNorm(Normalize): ...

def rgb_to_hsv(arr: ArrayLike) -> np.ndarray: ...
def hsv_to_rgb(hsv: ArrayLike) -> np.ndarray: ...
Expand Down