Commitc060837

authored

Merge pull request#646 from hugovk/fix-allowed-types

Vendor `typing._allowed_types` removed in Python 3.14

2 parentsa868b7e +e34eb85 commitc060837Copy full SHA for c060837

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@`
`33`	`33`	`# %% ../nbs/01_basics.ipynb`
`34`	`34`	`defaults=SimpleNamespace()`
`35`	`35`
	`36`	`+_allowed_types= (types.FunctionType,types.BuiltinFunctionType,`
	`37`	`+types.MethodType,types.ModuleType,`
	`38`	`+WrapperDescriptorType,MethodWrapperType,MethodDescriptorType)`
	`39`	`+`
`36`	`40`	`# %% ../nbs/01_basics.ipynb`
`37`	`41`	`defifnone(a,b):`
`38`	`42`	"`b` if `a` is None else `a`"
`@@ -352,7 +356,7 @@ def _eval_type(t, glb, loc):`
`352`	`356`
`353`	`357`	`deftype_hints(f):`
`354`	`358`	"Like `typing.get_type_hints` but returns `{}` if not allowed type"
`355`		`-ifnotisinstance(f,typing._allowed_types):return {}`
	`359`	`+ifnotisinstance(f,_allowed_types):return {}`
`356`	`360`	`ann,glb,loc=get_annotations_ex(f)`
`357`	`361`	`return {k:_eval_type(v,glb,loc)fork,vinann.items()}`
`358`	`362`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,11 @@`
`60`	`60`	`"outputs": [],`
`61`	`61`	`"source": [`
`62`	`62`	`"#\|export\n",`
`63`		`-"defaults = SimpleNamespace()"`
	`63`	`+"defaults = SimpleNamespace()\n",`
	`64`	`+"\n",`
	`65`	`+"_allowed_types = (types.FunctionType, types.BuiltinFunctionType,\n",`
	`66`	`+" types.MethodType, types.ModuleType,\n",`
	`67`	`+" WrapperDescriptorType, MethodWrapperType, MethodDescriptorType)"`
`64`	`68`	`]`
`65`	`69`	`},`
`66`	`70`	`{`
`@@ -1870,7 +1874,7 @@`
`1870`	`1874`	`"\n",`
`1871`	`1875`	`"def type_hints(f):\n",`
`1872`	`1876`	"\"Like `typing.get_type_hints` but returns `{}` if not allowed type\"\n",
`1873`		`-" if not isinstance(f,typing._allowed_types): return {}\n",`
	`1877`	`+" if not isinstance(f, _allowed_types): return {}\n",`
`1874`	`1878`	`" ann,glb,loc = get_annotations_ex(f)\n",`
`1875`	`1879`	`" return {k:_eval_type(v,glb,loc) for k,v in ann.items()}"`
`1876`	`1880`	`]`

Comments

(0)