NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22k

Commitcd3685f

authored

Create RCKeyType (#30316)

* Create RCKeyType* Create RCGroupKeyType* Rename types for consistent naming* Replace str with RcKeyType on RcParams* Replace str with RcKeyType or RcGroupKeyType on matplotlib* Accord pyplot and matplotlib type hints* Correct RcParams dict key type* Correct mypy errors

1 parent73ef257 commitcd3685fCopy full SHA for cd3685f

File tree

4 files changed

+402

-12

lines changed

lib/matplotlib

4 files changed

+402

-12

lines changed

`‎lib/matplotlib/init.pyi‎`

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ import contextlib`
`39`	`39`	`frompackaging.versionimportVersion`
`40`	`40`
`41`	`41`	`frommatplotlib._apiimportMatplotlibDeprecationWarning`
	`42`	`+frommatplotlib.typingimportRcKeyType,RcGroupKeyType`
`42`	`43`	`fromtypingimportAny,Literal,NamedTuple,overload`
`43`	`44`	`frommatplotlib.typingimportLogLevel`
`44`	`45`
`@@ -69,18 +70,18 @@ def get_cachedir() -> str: ...`
`69`	`70`	`defget_data_path()->str: ...`
`70`	`71`	`defmatplotlib_fname()->str: ...`
`71`	`72`
`72`		`-classRcParams(dict[str,Any]):`
	`73`	`+classRcParams(dict[RcKeyType,Any]):`
`73`	`74`	`validate:dict[str,Callable]`
`74`	`75`	`def__init__(self,args,*kwargs)->None: ...`
`75`		`-def_set(self,key:str,val:Any)->None: ...`
`76`		`-def_get(self,key:str)->Any: ...`
	`76`	`+def_set(self,key:RcKeyType,val:Any)->None: ...`
	`77`	`+def_get(self,key:RcKeyType)->Any: ...`
`77`	`78`
`78`	`79`	`def_update_raw(self,other_params:dict\|RcParams)->None: ...`
`79`	`80`
`80`	`81`	`def_ensure_has_backend(self)->None: ...`
`81`		`-def__setitem__(self,key:str,val:Any)->None: ...`
`82`		`-def__getitem__(self,key:str)->Any: ...`
`83`		`-def__iter__(self)->Generator[str,None,None]: ...`
	`82`	`+def__setitem__(self,key:RcKeyType,val:Any)->None: ...`
	`83`	`+def__getitem__(self,key:RcKeyType)->Any: ...`
	`84`	`+def__iter__(self)->Generator[RcKeyType,None,None]: ...`
`84`	`85`	`def__len__(self)->int: ...`
`85`	`86`	`deffind_all(self,pattern:str)->RcParams: ...`
`86`	`87`	`defcopy(self)->RcParams: ...`
`@@ -95,17 +96,17 @@ def rc_params_from_file(`
`95`	`96`	`rcParamsDefault:RcParams`
`96`	`97`	`rcParams:RcParams`
`97`	`98`	`rcParamsOrig:RcParams`
`98`		`-defaultParams:dict[str,Any]`
	`99`	`+defaultParams:dict[RcKeyType,Any]`
`99`	`100`
`100`		`-defrc(group:str,**kwargs)->None: ...`
	`101`	`+defrc(group:RcGroupKeyType,**kwargs)->None: ...`
`101`	`102`	`defrcdefaults()->None: ...`
`102`	`103`	`defrc_file_defaults()->None: ...`
`103`	`104`	`defrc_file(`
`104`	`105`	`fname:str\|Path\|os.PathLike,*,use_default_template:bool= ...`
`105`	`106`	`)->None: ...`
`106`	`107`	`@contextlib.contextmanager`
`107`	`108`	`defrc_context(`
`108`		`-rc:dict[str,Any]\|None= ...,fname:str\|Path\|os.PathLike\|None= ...`
	`109`	`+rc:dict[RcKeyType,Any]\|None= ...,fname:str\|Path\|os.PathLike\|None= ...`
`109`	`110`	`)->Generator[None,None,None]: ...`
`110`	`111`	`defuse(backend:str,*,force:bool= ...)->None: ...`
`111`	`112`	`@overload`

`‎lib/matplotlib/_mathtext.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ def __init__(self, default_font_prop: FontProperties, load_glyph_flags: LoadFlag`
`570`	`570`
`571`	`571`	`super().__init__(default_font_prop,load_glyph_flags)`
`572`	`572`	`fortexfontin"cal rm tt it bf sf bfit".split():`
`573`		`-prop=mpl.rcParams['mathtext.'+texfont]`
	`573`	`+prop=mpl.rcParams['mathtext.'+texfont]# type: ignore[index]`
`574`	`574`	`font=findfont(prop)`
`575`	`575`	`self.fontmap[texfont]=font`
`576`	`576`	`prop=FontProperties('cmex10')`

`‎lib/matplotlib/pyplot.py‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,8 @@`
`146`	`146`	`MarkerType,`
`147`	`147`	`MouseEventType,`
`148`	`148`	`PickEventType,`
	`149`	`+RcGroupKeyType,`
	`150`	`+RcKeyType,`
`149`	`151`	`ResizeEventType,`
`150`	`152`	`LogLevel`
`151`	`153`	`)`
`@@ -790,13 +792,13 @@ def pause(interval: float) -> None:`
`790`	`792`
`791`	`793`
`792`	`794`	`@_copy_docstring_and_deprecators(matplotlib.rc)`
`793`		`-defrc(group:str,**kwargs)->None:`
	`795`	`+defrc(group:RcGroupKeyType,**kwargs)->None:`
`794`	`796`	`matplotlib.rc(group,**kwargs)`
`795`	`797`
`796`	`798`
`797`	`799`	`@_copy_docstring_and_deprecators(matplotlib.rc_context)`
`798`	`800`	`defrc_context(`
`799`		`-rc:dict[str,Any]\|None=None,`
	`801`	`+rc:dict[RcKeyType,Any]\|None=None,`
`800`	`802`	`fname:str\|pathlib.Path\|os.PathLike\|None=None,`
`801`	`803`	`)->AbstractContextManager[None]:`
`802`	`804`	`returnmatplotlib.rc_context(rc,fname)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitcd3685f

File tree

4 files changed

4 files changed

`‎lib/matplotlib/init.pyi‎`

`‎lib/matplotlib/_mathtext.py‎`

`‎lib/matplotlib/pyplot.py‎`

0 commit comments

Movatterモバイル変換

Uh oh!

File tree

4 files changed

4 files changed

‎lib/matplotlib/__init__.pyi‎

‎lib/matplotlib/_mathtext.py‎

‎lib/matplotlib/pyplot.py‎

0 commit comments

`‎lib/matplotlib/init.pyi‎`

`‎lib/matplotlib/_mathtext.py‎`

`‎lib/matplotlib/pyplot.py‎`