8000 import and type hint corrections · matplotlib/matplotlib@3a7ac41 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3a7ac41

Browse files
bandpoojabandpooja
committed
import and type hint corrections
1 parent b5c7c2b commit 3a7ac41

File tree

1 file changed

+42
-25
lines changed

1 file changed

+42
-25
lines changed

‎lib/matplotlib/dates.pyi

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ import datetime
22
import numpy as np
33
from typing import Any, Callable, Dict, List, Optional, Sequence, Union
44

5-
from .ticker import Formatter, Locator
6-
from .units import Axis, AxisInfo, ConversionInterface
5+
from .axis import Axis
6+
from .projections.polar import _AxisWrapper
7+
from .ticker import _DummyAxis, Formatter, Locator
8+
from .units import AxisInfo, ConversionInterface
79

810

11+
# --- Global Functions ---
12+
913
def _get_tzinfo(tz: Optional[Union[str, datetime.tzinfo]] = ...) -> datetime.tzinfo: ...
1014

1115
def _reset_epoch_test_example() -> None: ...
@@ -30,13 +34,15 @@ def drange(dstart: datetime.datetime, dend: datetime.datetime, delta: datetime.t
3034

3135
def _wrap_in_tex(text: str) -> str: ...
3236

37+
# --- Formatter Classes ---
38+
3339
class DateFormatter(Formatter):
3440
tz: Optional[Union[str, datetime.tzinfo]]
3541
fmt: str
3642
_usetex: Optional[bool]
3743

3844
def __init__(self, fmt: str, tz: Optional[Union[str, datetime.tzinfo]] = None, *, usetex: Optional[bool] = None) -> None: ...
39-
def __call__(self, x: float, pos: int = 0) -> str: ...
45+
def __call__(self, x: float, pos: Optional[int] = 0) -> str: ...
4046
def set_tzinfo(self, tz: Optional[Union[str, datetime.tzinfo]]) -> None: ...
4147

4248
class ConciseDateFormatter(Formatter):
@@ -56,7 +62,7 @@ class ConciseDateFormatter(Formatter):
5662
zero_formats: Optional[Sequence[str]] = None,
5763
show_offset: bool = True,
5864
*, usetex: Optional[bool] = None) -> None: ...
59-
def __call__(self, x: float, pos: Optional[int] = None) -> List[str]: ...
65+
def __call__(self, x: float, pos: Optional[int] = 0) -> str: ...
6066
def format_ticks(self, values: Sequence[float]) -> List[str]: ...
6167
def get_offset(self) -> str: ...
6268
def format_data_short(self, value: float) -> str: ...
@@ -74,33 +80,36 @@ class AutoDateFormatter(Formatter):
7480
defaultfmt: str = '%Y-%m-%d',
7581
*, usetex: Optional[bool] = None) -> None: ...
7682
def _set_locator(self, locator: Locator) -> None: ...
77-
def __call__(self, x: float, pos: Optional[int] = None) -> str: ...
83+
def __call__(self, x: float, pos: Optional[int] = 0) -> str: ...
7884

85+
# --- rrulewrapper (assuming it's in rrule.py and this is its stub) ---
7986
class rrulewrapper:
8087
def __init__(self, freq: int, tzinfo: Optional[datetime.tzinfo] = None, **kwargs: Any) -> None: ...
8188
def set(self, **kwargs: Any) -> None: ...
8289
def _update_rrule(self, **kwargs: Any) -> None: ...
83-
def _attach_tzinfo(self, dt: datetime, tzinfo: datetime.tzinfo) -> datetime: ...
90+
def _attach_tzinfo(self, dt: datetime.datetime, tzinfo: datetime.tzinfo) -> datetime.datetime: ...
8491
def _aware_return_wrapper(self, f: Callable[..., Any], returns_list: bool = False) -> Callable[..., Any]: ...
8592
def __getattr__(self, name: str) -> Any: ...
8693
def __setstate__(self, state: dict) -> None: ...
8794

95+
# --- Locator Classes ---
96+
8897
class DateLocator(Locator):
8998
hms0d: dict[str, int]
9099

91-
def __init__(self, tz: Optional[Any] = None) -> None: ...
92-
def set_tzinfo(self, tz: Optional[Any]) -> None: ...
100+
def __init__(self, tz: Optional[datetime.tzinfo] = None) -> None: ...
101+
def set_tzinfo(self, tz: Optional[datetime.tzinfo]) -> None: ...
93102
def datalim_to_dt(self) -> tuple[datetime.datetime, datetime.datetime]: ...
94103
def viewlim_to_dt(self) -> tuple[datetime.datetime, datetime.datetime]: ...
95104
def _get_unit(self) -> float: ...
96105
def _get_interval(self) -> int: ...
97106
def nonsingular(self, vmin: float, vmax: float) -> tuple[float, float]: ...
98107

99108
class RRuleLocator(DateLocator):
100-
def __init__(self, o: rrulewrapper, tz: Optional[Any] = None) -> None: ...
109+
def __init__(self, o: rrulewrapper, tz: Optional[datetime.tzinfo] = None) -> None: ...
101110
def __call__(self) -> List[float]: ...
102-
def tick_values(self, vmin: datetime, vmax: datetime) -> List[float]: ...
103-
def _create_rrule(self, vmin: datetime, vmax: datetime) -> tuple[datetime.datetime, datetime.datetime]: ...
111+
def tick_values(self, vmin: float, vmax: float) -> List[float]: ...
112+
def _create_rrule(self, vmin: datetime.datetime, vmax: datetime.datetime) -> tuple[datetime.datetime, datetime.datetime]: ...
104113
def _get_unit(self) -> float: ...
105114
@staticmethod
106115
def get_unit_generic(freq: int) -> float: ...
@@ -119,14 +128,14 @@ class AutoDateLocator(DateLocator):
119128

120129
def _get_unit(self) -> float: ...
121130

122-
def get_locator(self, dmin: datetime, dmax: datetime) -> RRuleLocator: ...
131+
def get_locator(self, dmin: datetime.datetime, dmax: datetime.datetime) -> RRuleLocator: ...
123132

124133

125134
class YearLocator(RRuleLocator):
126135
def __init__(self, base: int = 1, month: int = 1, day: int = 1,
127136
tz: Optional[Union[str, datetime.tzinfo]] = None) -> None: ...
128137

129-
def _create_rrule(self, vmin: datetime, vmax: datetime) -> tuple[datetime.datetime, datetime.datetime]: ...
138+
def _create_rrule(self, vmin: datetime.datetime, vmax: datetime.datetime) -> tuple[datetime.datetime, datetime.datetime]: ...
130139

131140

132141
class MonthLocator(RRuleLocator):
@@ -157,27 +166,31 @@ class SecondLocator(RRuleLocator):
157166
class MicrosecondLocator(DateLocator):
158167
def __init__(self, interval: int = 1, tz: Optional[Union[str, datetime.tzinfo]] = None) -> None: ...
159168

160-
def set_axis(self, axis) -> None: ...
169+
# Fix: Argument 1 incompatible with supertype TickHelper
170+
def set_axis(self, axis: Union[Axis, _DummyAxis, _AxisWrapper, None]) -> None: ...
161171

162172
def __call__(self) -> List[float]: ...
163173

164-
def tick_values(self, vmin: datetime, vmax: datetime) -> np.ndarray: ...
174+
def tick_values(self, vmin: float, vmax: float) -> Sequence[float]: ...
165175

166176
def _get_unit(self) -> float: ...
167177

168178
def _get_interval(self) -> int: ...
169179

180+
# --- Converter Classes ---
181+
170182
class DateConverter(ConversionInterface):
171183
def __init__(self, *, interval_multiples: bool = True) -> None: ...
172184

173-
def axisinfo(self, unit: Optional[datetime.tzinfo], axis: Axis) -> AxisInfo: ...
185+
@staticmethod
186+
def axisinfo(unit: Optional[datetime.tzinfo], axis: Axis) -> AxisInfo: ...
174187

175188
@staticmethod
176-
def convert(value: Union[datetime.datetime, datetime.date, float, Sequence[Union[datetime.datetime, datetime.date, float]]],
189+
def convert(value: Union[datetime.datetime, datetime.date, float, np.datetime64, Sequence[Union[datetime.datetime, datetime.date, float, np.datetime64]]],
177190
unit: Optional[datetime.tzinfo], axis: Axis) -> Union[float, np.ndarray]: ...
178191

179192
@staticmethod
180-
def default_units(x: Union[datetime.datetime, datetime.date, float, np.ndarray, Sequence[Union[datetime.datetime, datetime.date, float]]],
193+
def default_units(x: Union[datetime.datetime, datetime.date, float, np.ndarray, Sequence[Union[datetime.datetime, datetime.date, float, np.datetime64]]],
181194
axis: Axis) -> Optional[datetime.tzinfo]: ...
182195

183196

@@ -186,17 +199,21 @@ class ConciseDateConverter(DateConverter):
186199
offset_formats: Optional[List[str]] = None,
187200
show_offset: bool = True, *, interval_multiples: bool = True) -> None: ...
188201

189-
def axisinfo(self, unit: Optional[datetime.tzinfo], axis: Axis) -> AxisInfo: ...
202+
@staticmethod
203+
def axisinfo(unit: Optional[datetime.tzinfo], axis: Axis) -> AxisInfo: ...
204+
190205

191206
class _SwitchableDateConverter:
192207
@staticmethod
193208
def _get_converter() -> Union["ConciseDateConverter", "DateConverter"]: ...
194209

195-
def axisinfo(self, unit: Optional[datetime.tzinfo], axis: Axis) -> AxisInfo: ...
210+
@staticmethod
211+
def axisinfo(unit: Optional[datetime.tzinfo], axis: Axis) -> AxisInfo: ...
196212

197-
def default_units(self, x: Union[datetime.datetime, datetime.date, float, np.ndarray, Sequence[Union[datetime.datetime, datetime.date, float, np.datetime64]]],
198-
axis: Axis) -> Optional[datetime.tzinfo]: ...
213+
@staticmethod
214+
def default_units(x: Union[datetime.datetime, datetime.date, float, np.ndarray, Sequence[Union[datetime.datetime, datetime.date, float, np.datetime64]]],
215+
axis: Axis) -> Optional[datetime.tzinfo]: ...
199216

200-
def convert(self, value: Union[datetime.datetime, datetime.date, float, np.datetime64, Sequence[Union[datetime.datetime, datetime.date, float, np.datetime64]]],
201-
unit: Optional[datetime.tzinfo], axis: Axis) -> Union[float, np.ndarray]: ...
202-
217+
@staticmethod
218+
def convert(value: Union[datetime.datetime, datetime.date, float, np.datetime64, Sequence[Union[datetime.datetime, datetime.date, float, np.datetime64]]],
219+
unit: Optional[datetime.tzinfo], axis: Axis) -> Union[float, np.ndarray]: ...

0 commit comments

Comments
 (0)
0