Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[TYP/MNT] Remove unused imports from stub files #25787

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
merged 1 commit into from
May 16, 2023
Merged

[TYP/MNT] Remove unused imports from stub files #25787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions lib/matplotlib/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,11 @@ __all__ = [
import os
from pathlib import Path

from . import cbook, rcsetup
from collections.abc import Callable, Generator, MutableMapping
from collections.abc import Callable, Generator
import contextlib
from packaging.version import Version

from matplotlib._api import MatplotlibDeprecationWarning
from matplotlib.cbook import sanitize_sequence
from matplotlib.rcsetup import cycler, validate_backend
from typing import Any, NamedTuple

__bibtex__: str
Expand Down
7 changes: 0 additions & 7 deletions lib/matplotlib/animation.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ import abc
from collections.abc import Callable, Collection, Iterable, Sequence, Generator
import contextlib
from pathlib import Path
from matplotlib import cbook
from matplotlib._animation_data import (
DISPLAY_TEMPLATE,
INCLUDED_FRAMES,
JS_INCLUDE,
STYLE_INCLUDE,
)
from matplotlib.artist import Artist
from matplotlib.backend_bases import TimerBase
from matplotlib.figure import Figure
Expand Down
6 changes: 0 additions & 6 deletions lib/matplotlib/artist.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
from . import cbook as cbook
from .axes import Axes
from .axes._base import _AxesBase
from .backend_bases import RendererBase, MouseEvent
from .cm import ScalarMappable
from .colors import BoundaryNorm
from .figure import Figure, SubFigure
from .path import Path
from .patches import Patch
from .patheffects import AbstractPathEffect
from .transforms import (
Bbox,
IdentityTransform,
Transform,
TransformedBbox,
TransformedPatchPath,
TransformedPath,
)
Expand Down
8 changes: 3 additions & 5 deletions lib/matplotlib/axes/_base.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import matplotlib.artist as martist

import datetime
from collections.abc import Callable, Iterable, Iterator, Sequence, MutableSequence
from matplotlib import cbook, offsetbox
from collections.abc import Callable, Iterable, Iterator, Sequence
from matplotlib import cbook
from matplotlib.artist import Artist
from matplotlib.axis import XAxis, YAxis, Tick
from matplotlib.backend_bases import RendererBase, MouseButton, MouseEvent
from matplotlib.cbook import index_of
from matplotlib.container import Container
from matplotlib.collections import Collection
from matplotlib.cm import ScalarMappable
Expand All @@ -20,8 +19,7 @@ from matplotlib.scale import ScaleBase
from matplotlib.spines import Spines
from matplotlib.table import Table
from matplotlib.text import Text
from matplotlib.rcsetup import cycler, validate_axisbelow
from matplotlib.transforms import Transform, BboxBase, Bbox
from matplotlib.transforms import Transform, Bbox

from cycler import Cycler

Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/axes/_secondary_axes.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from matplotlib.axes._base import _AxesBase
from matplotlib.axis import Axis, Tick
from matplotlib.axis import Tick

from matplotlib.transforms import Transform

Expand Down
8 changes: 1 addition & 7 deletions lib/matplotlib/backend_bases.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ from enum import Enum, IntEnum
import os
from matplotlib import (
cbook,
colors,
get_backend,
is_interactive,
rcParams,
textpath,
transforms,
widgets,
_api,
)
from matplotlib._pylab_helpers import Gcf
from matplotlib.artist import Artist
from matplotlib.axes import Axes
from matplotlib.backend_managers import ToolManager
Expand All @@ -22,7 +16,7 @@ from matplotlib.font_manager import FontProperties
from matplotlib.path import Path
from matplotlib.texmanager import TexManager
from matplotlib.text import Text
from matplotlib.transforms import Affine2D, Transform, TransformedPath, Bbox
from matplotlib.transforms import Transform, TransformedPath, Bbox

from collections.abc import Callable, Iterable, Sequence
from typing import Any, IO, Literal, NamedTuple, TypeVar
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/backend_tools.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ from matplotlib.backend_bases import ToolContainerBase, FigureCanvasBase
from matplotlib.backend_managers import ToolManager, ToolEvent
from matplotlib.figure import Figure
from matplotlib.scale import ScaleBase
from matplotlib._pylab_helpers import Gcf

from typing import Any

Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/cm.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from collections.abc import Iterator, Mapping
from matplotlib import cbook, colors, scale
from matplotlib import cbook, colors
from matplotlib.colorbar import Colorbar
from matplotlib._cm import datad

import numpy as np
from numpy.typing import ArrayLike
Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/collections.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from . import artist, cbook, cm, transforms
from . import artist, cm, transforms
from .backend_bases import MouseEvent
from .artist import Artist
from .colors import Normalize, Colormap
from .path import Path
from .patches import Patch
from .ticker import Locator, Formatter
from .tri import Triangulation
from ._enums import CapStyle, JoinStyle

import numpy as np
from numpy.typing import ArrayLike
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/colorbar.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import matplotlib.spines as mspines
from matplotlib import cbook, cm, collections, colors, contour, ticker
from matplotlib import cm, collections, colors, contour
from matplotlib.axes import Axes
from matplotlib.backend_bases import RendererBase
from matplotlib.patches import Patch
Expand Down
7 changes: 6 additions & 1 deletion lib/matplotlib/colors.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from ._color_data import BASE_COLORS, CSS4_COLORS, TABLEAU_COLORS, XKCD_COLORS
from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
from matplotlib import cbook, scale
import re
Expand All @@ -9,6 +8,12 @@ from .typing import ColorType
import numpy as np
from numpy.typing import ArrayLike

# Explicitly export colors dictionaries which are imported in the impl
BASE_COLORS: dict[str, ColorType]
CSS4_COLORS: dict[str, ColorType]
TABLEAU_COLORS: dict[str, ColorType]
XKCD_COLORS: dict[str, ColorType]

class _ColorMapping(dict[str, ColorType]):
cache: dict[tuple[ColorType, float | None], tuple[float, float, float, float]]
def __init__(self, mapping) -> None: ...
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/container.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from matplotlib import cbook
from matplotlib.artist import Artist
from matplotlib.lines import Line2D
from matplotlib.collections import LineCollection
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/contour.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import matplotlib.cm as cm
from matplotlib.artist import Artist
from matplotlib.axes import Axes
from matplotlib.backend_bases import MouseButton
from matplotlib.collections import Collection, PathCollection
from matplotlib.colors import Colormap, Normalize
from matplotlib.font_manager import FontProperties
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/dviread.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from matplotlib import cbook as cbook
from pathlib import Path
import io
import os
Expand Down
21 changes: 3 additions & 18 deletions lib/matplotlib/figure.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,24 @@
import os

from matplotlib import backend_bases, projections
from matplotlib.artist import Artist, allow_rasterization
from matplotlib.artist import Artist
from matplotlib.axes import Axes, SubplotBase
from matplotlib.backend_bases import (
DrawEvent,
FigureCanvasBase,
MouseButton,
MouseEvent,
NonGuiException,
RendererBase,
)
from matplotlib.colors import Colormap, Normalize
from matplotlib.colorbar import Colorbar
from matplotlib.cm import ScalarMappable
from matplotlib.gridspec import GridSpec, SubplotSpec
from matplotlib.image import _ImageBase, FigureImage
from matplotlib.layout_engine import (
ConstrainedLayoutEngine,
LayoutEngine,
PlaceHolderLayoutEngine,
TightLayoutEngine,
)
from matplotlib.layout_engine import LayoutEngine
from matplotlib.legend import Legend
from matplotlib.lines import Line2D
from matplotlib.patches import Rectangle, Patch
from matplotlib.text import Text
from matplotlib.transforms import (
Affine2D,
Bbox,
BboxBase,
BboxTransformTo,
TransformedBbox,
Transform,
)
from matplotlib.transforms import Affine2D, Bbox, Transform

import numpy as np
from numpy.typing import ArrayLike
Expand Down
7 changes: 1 addition & 6 deletions lib/matplotlib/font_manager.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
from dataclasses import dataclass
import json
import os

from matplotlib._afm import AFM
from matplotlib import cbook, ft2font
from matplotlib._fontconfig_pattern import (
generate_fontconfig_pattern,
parse_fontconfig_pattern,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weirdly, this one is public enough to appear in API change notes, but not public enough to be in API documentation.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was debating on this one, current leaning is to leave it out of stubs until and unless someone complains, which I kind of doubt will happen.

)
from matplotlib import ft2font

from pathlib import Path

Expand Down
11 changes: 2 additions & 9 deletions lib/matplotlib/image.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
import io
import os
import pathlib

from matplotlib._image import *
import matplotlib.artist as martist
from matplotlib.axes import Axes
from matplotlib import cbook, cm
from matplotlib.backend_bases import FigureCanvasBase, RendererBase, MouseEvent
from matplotlib import cm
from matplotlib.backend_bases import RendererBase, MouseEvent
from matplotlib.colors import Colormap, Normalize
from matplotlib.figure import Figure
from matplotlib.transforms import (
Affine2D,
Bbox,
BboxBase,
BboxTransform,
BboxTransformTo,
IdentityTransform,
TransformedBbox,
Transform,
)

from collections.abc import Sequence
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/layout_engine.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from matplotlib._constrained_layout import do_constrained_layout
from matplotlib._tight_layout import get_subplotspec_list, get_tight_layout_figure
from matplotlib.figure import Figure

from typing import Any
Expand Down
25 changes: 2 additions & 23 deletions lib/matplotlib/legend.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,17 @@
from . import legend_handler
from matplotlib import colors, offsetbox
from matplotlib.axes import Axes
from matplotlib.artist import Artist, allow_rasterization
from matplotlib.artist import Artist
from matplotlib.backend_bases import MouseEvent
from matplotlib.cbook import silent_list
from matplotlib.collections import (
CircleCollection,
Collection,
LineCollection,
PathCollection,
PolyCollection,
RegularPolyCollection,
)
from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
from matplotlib.figure import Figure
from matplotlib.font_manager import FontProperties
from matplotlib.legend_handler import HandlerBase
from matplotlib.lines import Line2D
from matplotlib.offsetbox import (
AnchoredOffsetbox,
DraggableOffsetBox,
DrawingArea,
HPacker,
TextArea,
VPacker,
)
from matplotlib.patches import FancyBboxPatch, Patch, Rectangle, Shadow, StepPatch
from matplotlib.patches import FancyBboxPatch, Patch, Rectangle
from matplotlib.text import Text
from matplotlib.transforms import (
Bbox,
BboxBase,
BboxTransformFrom,
BboxTransformTo,
TransformedBbox,
Transform,
)

Expand Down
21 changes: 2 additions & 19 deletions lib/matplotlib/lines.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
from . import cbook
from .artist import Artist, allow_rasterization
from .artist import Artist
from .axes import Axes
from .backend_bases import MouseEvent, FigureCanvasBase
from .cbook import STEP_LOOKUP_MAP, ls_mapper, ls_mapper_r
from .markers import (
CARETDOWN,
CARETDOWNBASE,
CARETLEFT,
CARETLEFTBASE,
CARETRIGHT,
CARETRIGHTBASE,
CARETUP,
CARETUPBASE,
TICKDOWN,
TICKLEFT,
TICKRIGHT,
TICKUP,
MarkerStyle,
)
from .path import Path
from .transforms import Bbox, BboxTransformTo, TransformedPath, Transform
from .transforms import Bbox, Transform

from collections.abc import Callable, Sequence
from typing import Any, Literal, overload
Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/markers.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from . import cbook
from ._enums import CapStyle, JoinStyle
from .path import Path
from .transforms import Affine2D, IdentityTransform, Transform
from .transforms import Affine2D, Transform

from numpy.typing import ArrayLike
from .typing import FillStyleType
Expand Down
10 changes: 7 additions & 3 deletions lib/matplotlib/mathtext.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import io
import os
from ._mathtext import RasterParse, VectorParse, get_unicode_index
from matplotlib.font_manager import FontProperties
from matplotlib.ft2font import FT2Image, LOAD_NO_HINTING

# Re-exported API from _mathtext.
from ._mathtext import (
RasterParse as RasterParse,
VectorParse as VectorParse,
get_unicode_index as get_unicode_index,
)

from typing import IO, Literal
from matplotlib.typing import ColorType
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/mlab.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from matplotlib import cbook

from collections.abc import Callable
import functools
from typing import Literal
Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/offsetbox.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import matplotlib.artist as martist
from matplotlib.axes import Axes
from matplotlib.backend_bases import RendererBase, Event, FigureCanvasBase
from matplotlib.colors import Colormap, Normalize
import matplotlib.text as mtext
from matplotlib.figure import Figure
from matplotlib.font_manager import FontProperties
from matplotlib.image import BboxImage
from matplotlib.patches import FancyArrowPatch, FancyBboxPatch
from matplotlib.transforms import Bbox, BboxBase, TransformedBbox, Transform
from matplotlib.transforms import Bbox, BboxBase, Transform

import numpy as np
from numpy.typing import ArrayLike
Expand Down
Loading