Commite3a9a3d

committed

Merge branch 'master' into fix-annotated-with-function-as-type-keyword-list-parameter

2 parentsb47d21e +583c5f7 commite3a9a3dCopy full SHA for e3a9a3d

File tree

+44

-2

lines changed

+44

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1794,7 +1794,9 @@ def push_type_args(`
`1794`	`1794`	`ifself.is_defined_type_param(p.name):`
`1795`	`1795`	`self.fail(f'"{p.name}" already defined as a type parameter',context)`
`1796`	`1796`	`else:`
`1797`		`-self.add_symbol(p.name,tv,context,no_progress=True,type_param=True)`
	`1797`	`+assertself.add_symbol(`
	`1798`	`+p.name,tv,context,no_progress=True,type_param=True`
	`1799`	`+ ),"Type parameter should not be discarded"`
`1798`	`1800`
`1799`	`1801`	`returntvs`
`1800`	`1802`
`@@ -6830,6 +6832,7 @@ def add_symbol_table_node(`
`6830`	`6832`	`else:`
`6831`	`6833`	`# see note in docstring describing None contexts`
`6832`	`6834`	`self.defer()`
	`6835`	`+`
`6833`	`6836`	`if (`
`6834`	`6837`	`existingisnotNone`
`6835`	`6838`	`andcontextisnotNone`
`@@ -6849,7 +6852,9 @@ def add_symbol_table_node(`
`6849`	`6852`	`self.add_redefinition(names,name,symbol)`
`6850`	`6853`	`ifnot (isinstance(new, (FuncDef,Decorator))andself.set_original_def(old,new)):`
`6851`	`6854`	`self.name_already_defined(name,context,existing)`
`6852`		`-elifnamenotinself.missing_names[-1]and"*"notinself.missing_names[-1]:`
	`6855`	`+eliftype_paramor (`
	`6856`	`+namenotinself.missing_names[-1]and"*"notinself.missing_names[-1]`
	`6857`	`+ ):`
`6853`	`6858`	`names[name]=symbol`
`6854`	`6859`	`ifnotno_progress:`
`6855`	`6860`	`self.progress=True`

Lines changed: 37 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1228,6 +1228,43 @@ class C[T]:`
`1228`	`1228`	`def f[S, S](x: S) -> S: # E: "S" already defined as a type parameter`
`1229`	`1229`	`return x`
`1230`	`1230`
	`1231`	`+[case testPEP695TypeVarNameClashNoCrashForwardReference]`
	`1232`	`+# https://github.com/python/mypy/issues/18507`
	`1233`	`+from typing import TypeVar`
	`1234`	`+T = TypeVar("T", bound=Foo) # E: Name "Foo" is used before definition`
	`1235`	`+`
	`1236`	`+class Foo: ...`
	`1237`	`+class Bar[T]: ...`
	`1238`	`+`
	`1239`	`+[case testPEP695TypeVarNameClashNoCrashDeferredSymbol]`
	`1240`	`+# https://github.com/python/mypy/issues/19526`
	`1241`	`+T = Unknown # E: Name "Unknown" is not defined`
	`1242`	`+`
	`1243`	`+class Foo[T]: ...`
	`1244`	`+class Bar[*T]: ...`
	`1245`	`+class Baz[**T]: ...`
	`1246`	`+[builtins fixtures/tuple.pyi]`
	`1247`	`+`
	`1248`	`+[case testPEP695TypeVarNameClashTypeAlias]`
	`1249`	`+type Tb = object`
	`1250`	`+type Ta[Tb] = 'B[Tb]'`
	`1251`	`+class A[Ta]: ...`
	`1252`	`+class B[Tb](A[Ta]): ...`
	`1253`	`+`
	`1254`	`+[case testPEP695TypeVarNameClashStarImport]`
	`1255`	`+# Similar to`
	`1256`	`+# https://github.com/python/mypy/issues/19946`
	`1257`	`+import a`
	`1258`	`+`
	`1259`	`+[file a.py]`
	`1260`	`+from b import *`
	`1261`	`+class Foo[T]: ...`
	`1262`	`+`
	`1263`	`+[file b.py]`
	`1264`	`+from a import *`
	`1265`	`+class Bar[T]: ...`
	`1266`	`+[builtins fixtures/tuple.pyi]`
	`1267`	`+`
`1231`	`1268`	`[case testPEP695ClassDecorator]`
`1232`	`1269`	`from typing import Any`
`1233`	`1270`

Comments

(0)