Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 94e6f7b

Browse filesBrowse files
ksundenksunden
committed
Redistribute types defined in _typing to their logical homes
1 parent 333de75 commit 94e6f7b
Copy full SHA for 94e6f7b
Expand file treeCollapse file tree

30 files changed

+94
-79
lines changed
Open diff view settings
Collapse file

‎lib/matplotlib/_color_data.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/_color_data.pyi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from ._typing import Color
1+
from .colors import Color
22

33
BASE_COLORS: dict[str, Color]
44
TABLEAU_COLORS: dict[str, Color]
Collapse file

‎lib/matplotlib/axes/_axes.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_axes.pyi
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ from matplotlib.collections import (
1212
EventCollection,
1313
QuadMesh,
1414
)
15-
from matplotlib.colors import Colormap, Normalize
15+
from matplotlib.colors import Color, Colormap, Normalize
1616
from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
1717
from matplotlib.contour import ContourSet, QuadContourSet
1818
from matplotlib.image import AxesImage, PcolorImage
1919
from matplotlib.legend import Legend
2020
from matplotlib.legend_handler import HandlerBase
21-
from matplotlib.lines import Line2D
21+
from matplotlib.lines import Line2D, LineStyleType
22+
from matplotlib.markers import MarkerType
2223
from matplotlib.mlab import GaussianKDE
2324
from matplotlib.patches import Rectangle, FancyArrow, Polygon, StepPatch
2425
from matplotlib.quiver import Quiver, QuiverKey, Barbs
@@ -28,7 +29,6 @@ import matplotlib.tri as mtri
2829
import matplotlib.table as mtable
2930
import matplotlib.stackplot as mstack
3031
import matplotlib.streamplot as mstream
31-
from matplotlib._typing import Color, LineStyleType, MarkerType
3232

3333
import datetime
3434
import PIL
Collapse file

‎lib/matplotlib/axes/_base.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.pyi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ from matplotlib.backend_bases import RendererBase, MouseButton, MouseEvent
99
from matplotlib.cbook import index_of
1010
from matplotlib.container import Container
1111
from matplotlib.collections import Collection
12+
from matplotlib.colors import Color
1213
from matplotlib.cm import ScalarMappable
1314
from matplotlib.legend import Legend
1415
from matplotlib.lines import Line2D
@@ -28,7 +29,6 @@ from cycler import Cycler
2829
import numpy as np
2930
from numpy.typing import ArrayLike
3031
from typing import Any, Callable, Literal, Iterable, Iterator, Sequence, Type, overload
31-
from matplotlib._typing import Color
3232

3333
class _axis_method_wrapper:
3434
attr_name: str
Collapse file

‎lib/matplotlib/axes/_secondary_axes.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_secondary_axes.pyi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from matplotlib.axes._base import _AxesBase
22
from matplotlib.axis import Axis, Tick
33

4+
from matplotlib.colors import Color
45
from matplotlib.transforms import Transform
5-
from matplotlib._typing import Color
66

77
from typing import Literal, Callable, Iterable
88
from numpy.typing import ArrayLike
Collapse file

‎lib/matplotlib/axis.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/axis.pyi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import matplotlib.artist as martist
22
from matplotlib import cbook
33
from matplotlib.axes import Axes
44
from matplotlib.backend_bases import RendererBase
5+
from matplotlib.colors import Color
56
from matplotlib.lines import Line2D
67
from matplotlib.text import Text
78
from matplotlib.ticker import Locator, Formatter
89
from matplotlib.transforms import Transform, Bbox
910

1011
import datetime
1112
from typing import Any, Literal, Type, Iterable, Callable
12-
from matplotlib._typing import Color
1313
import numpy as np
1414
from numpy.typing import ArrayLike
1515

Collapse file

‎lib/matplotlib/backend_bases.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.pyi
+2-8Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,14 @@ from matplotlib.axes import Axes
1919
from matplotlib.backend_managers import ToolManager
2020
from matplotlib.backend_tools import Cursors, ToolBase
2121
from matplotlib.colorbar import Colorbar
22+
from matplotlib.colors import Color
2223
from matplotlib.figure import Figure
2324
from matplotlib.font_manager import FontProperties
25+
from matplotlib.lines import LineStyleType
2426
from matplotlib.path import Path
2527
from matplotlib.texmanager import TexManager
2628
from matplotlib.text import Text
2729
from matplotlib.transforms import Affine2D, Transform, TransformedPath, Bbox
28-
from matplotlib._typing import (
29-
Color,
30-
LineStyleType,
31-
FillStyleType,
32-
DrawStyleType,
33-
MarkerType,
34-
MarkEveryType,
35-
)
3630

3731
from typing import Any, Callable, Literal, NamedTuple, Sequence, Type, TypeVar
3832
from numpy.typing import ArrayLike
Collapse file

‎lib/matplotlib/collections.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/collections.pyi
+2-9Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
from . import artist, cbook, cm, transforms
22
from .backend_bases import MouseEvent
33
from .artist import Artist
4-
from .colors import Normalize, Colormap
4+
from .colors import Color, Normalize, Colormap
5+
from .lines import LineStyleType
56
from .path import Path
67
from .patches import Patch
78
from .ticker import Locator, Formatter
89
from .tri import Triangulation
910
from ._enums import CapStyle, JoinStyle
10-
from ._typing import (
11-
LineStyleType,
12-
FillStyleType,
13-
DrawStyleType,
14-
MarkerType,
15-
MarkEveryType,
16-
Color,
17-
)
1811

1912
import numpy as np
2013
from numpy.typing import ArrayLike
Collapse file

‎lib/matplotlib/colorbar.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/colorbar.pyi
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ from matplotlib.axes import Axes
44
from matplotlib.patches import Patch
55
from matplotlib.ticker import Locator, Formatter
66

7-
from matplotlib._typing import Color
8-
97
import numpy as np
108
from numpy.typing import ArrayLike
119
from typing import Any, Literal, Sequence, overload
@@ -80,7 +78,7 @@ class Colorbar:
8078
def add_lines(
8179
self,
8280
levels: ArrayLike,
83-
colors: Color | Sequence[Color],
81+
colors: colors.Color | Sequence[colors.Color],
8482
linewidths: float | ArrayLike,
8583
erase: bool = ...,
8684
) -> None: ...
Collapse file

‎lib/matplotlib/colors.py‎

Copy file name to clipboardExpand all lines: lib/matplotlib/colors.py
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
import itertools
4949
from numbers import Real
5050
import re
51+
from typing import Union
52+
5153
from PIL import Image
5254
from PIL.PngImagePlugin import PngInfo
5355

@@ -56,6 +58,12 @@
5658
from matplotlib import _api, _cm, cbook, scale
5759
from ._color_data import BASE_COLORS, TABLEAU_COLORS, CSS4_COLORS, XKCD_COLORS
5860

61+
Color = Union[
62+
tuple[float, float, float],
63+
tuple[float, float, float, float],
64+
str,
65+
]
66+
5967

6068
class _ColorMapping(dict):
6169
def __init__(self, mapping):
Collapse file

‎lib/matplotlib/colors.pyi‎

Copy file name to clipboardExpand all lines: lib/matplotlib/colors.pyi
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ from collections.abc import Mapping
33
from matplotlib import cbook, scale
44
import re
55

6-
from ._typing import Color
7-
from typing import Any, Callable, Sequence, Iterable, Iterator, Literal, Type, overload
6+
from typing import Any, Callable, Sequence, Iterable, Iterator, Literal, Type, Union, overload
87

98
import numpy as np
109
from numpy.typing import ArrayLike
1110

11+
Color = Union[tuple[float, float, float], tuple[float, float, float, float], str]
12+
1213
class _ColorMapping(dict[str, Color]):
1314
cache: dict[tuple[Color, float | None], tuple[float, float, float, float]]
1415
def __init__(self, mapping) -> None: ...

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.