File size: 74,675 Bytes
d0faac4 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 | diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index d063837bae..d555c53fee 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -12,6 +12,7 @@
import stat
import sys
import sysconfig
+import textwrap
import time
import types
import unittest
@@ -619,6 +620,14 @@ def sortdict(dict):
withcommas = ", ".join(reprpairs)
return "{%s}" % withcommas
+
+def run_code(code: str) -> dict[str, object]:
+ """Run a piece of code after dedenting it, and return its global namespace."""
+ ns = {}
+ exec(textwrap.dedent(code), ns)
+ return ns
+
+
def check_syntax_error(testcase, statement, errtext='', *, lineno=None, offset=None):
with testcase.assertRaisesRegex(SyntaxError, errtext) as cm:
compile(statement, '<test string>', 'exec')
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 34808ed856..cf128e1e8c 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -181,7 +181,22 @@ def to_tuple(t):
"def f(a=1, /, b=2, *, c): pass",
"def f(a=1, /, b=2, *, c=4, **kwargs): pass",
"def f(a=1, /, b=2, *, c, **kwargs): pass",
-
+ # Type aliases
+ "type X = int",
+ "type X[T] = int",
+ "type X[T, *Ts, **P] = (T, Ts, P)",
+ "type X[T: int, *Ts, **P] = (T, Ts, P)",
+ "type X[T: (int, str), *Ts, **P] = (T, Ts, P)",
+ # Generic classes
+ "class X[T]: pass",
+ "class X[T, *Ts, **P]: pass",
+ "class X[T: int, *Ts, **P]: pass",
+ "class X[T: (int, str), *Ts, **P]: pass",
+ # Generic functions
+ "def f[T](): pass",
+ "def f[T, *Ts, **P](): pass",
+ "def f[T: int, *Ts, **P](): pass",
+ "def f[T: (int, str), *Ts, **P](): pass",
]
# These are compiled through "single"
@@ -262,7 +277,6 @@ def to_tuple(t):
"()",
# Combination
"a.b.c.d(a.b[1:2])",
-
]
# TODO: expr_context, slice, boolop, operator, unaryop, cmpop, comprehension
@@ -1013,6 +1027,18 @@ def test_exception_groups_feature_version(self):
with self.assertRaises(SyntaxError):
ast.parse(code, feature_version=(3, 10))
+ def test_type_params_feature_version(self):
+ samples = [
+ "type X = int",
+ "class X[T]: pass",
+ "def f[T](): pass",
+ ]
+ for sample in samples:
+ with self.subTest(sample):
+ ast.parse(sample)
+ with self.assertRaises(SyntaxError):
+ ast.parse(sample, feature_version=(3, 11))
+
def test_invalid_major_feature_version(self):
with self.assertRaises(ValueError):
ast.parse('pass', feature_version=(2, 7))
@@ -1557,16 +1583,16 @@ def arguments(args=None, posonlyargs=None, vararg=None,
def test_funcdef(self):
a = ast.arguments([], [], None, [], [], None, [])
- f = ast.FunctionDef("x", a, [], [], None)
+ f = ast.FunctionDef("x", [], a, [], [], None)
self.stmt(f, "empty body on FunctionDef")
- f = ast.FunctionDef("x", a, [ast.Pass()], [ast.Name("x", ast.Store())],
+ f = ast.FunctionDef("x", [], a, [ast.Pass()], [ast.Name("x", ast.Store())],
None)
self.stmt(f, "must have Load context")
- f = ast.FunctionDef("x", a, [ast.Pass()], [],
+ f = ast.FunctionDef("x", [], a, [ast.Pass()], [],
ast.Name("x", ast.Store()))
self.stmt(f, "must have Load context")
def fac(args):
- return ast.FunctionDef("x", args, [ast.Pass()], [], None)
+ return ast.FunctionDef("x", [], args, [ast.Pass()], [], None)
self._check_arguments(fac, self.stmt)
def test_classdef(self):
@@ -1579,7 +1605,7 @@ def cls(bases=None, keywords=None, body=None, decorator_list=None):
body = [ast.Pass()]
if decorator_list is None:
decorator_list = []
- return ast.ClassDef("myclass", bases, keywords,
+ return ast.ClassDef("myclass", [], bases, keywords,
body, decorator_list)
self.stmt(cls(bases=[ast.Name("x", ast.Store())]),
"must have Load context")
@@ -2869,23 +2895,23 @@ def main():
exec_results = [
('Module', [('Expr', (1, 0, 1, 4), ('Constant', (1, 0, 1, 4), None, None))], []),
('Module', [('Expr', (1, 0, 1, 18), ('Constant', (1, 0, 1, 18), 'module docstring', None))], []),
-('Module', [('FunctionDef', (1, 0, 1, 13), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 9, 1, 13))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 29), 'f', ('arguments', [], [], None, [], [], None, []), [('Expr', (1, 9, 1, 29), ('Constant', (1, 9, 1, 29), 'function docstring', None))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 14), 'f', ('arguments', [], [('arg', (1, 6, 1, 7), 'a', None, None)], None, [], [], None, []), [('Pass', (1, 10, 1, 14))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 16), 'f', ('arguments', [], [('arg', (1, 6, 1, 7), 'a', None, None)], None, [], [], None, [('Constant', (1, 8, 1, 9), 0, None)]), [('Pass', (1, 12, 1, 16))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 18), 'f', ('arguments', [], [], ('arg', (1, 7, 1, 11), 'args', None, None), [], [], None, []), [('Pass', (1, 14, 1, 18))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 23), 'f', ('arguments', [], [], ('arg', (1, 7, 1, 16), 'args', ('Starred', (1, 13, 1, 16), ('Name', (1, 14, 1, 16), 'Ts', ('Load',)), ('Load',)), None), [], [], None, []), [('Pass', (1, 19, 1, 23))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 36), 'f', ('arguments', [], [], ('arg', (1, 7, 1, 29), 'args', ('Starred', (1, 13, 1, 29), ('Subscript', (1, 14, 1, 29), ('Name', (1, 14, 1, 19), 'tuple', ('Load',)), ('Tuple', (1, 20, 1, 28), [('Name', (1, 20, 1, 23), 'int', ('Load',)), ('Constant', (1, 25, 1, 28), Ellipsis, None)], ('Load',)), ('Load',)), ('Load',)), None), [], [], None, []), [('Pass', (1, 32, 1, 36))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 36), 'f', ('arguments', [], [], ('arg', (1, 7, 1, 29), 'args', ('Starred', (1, 13, 1, 29), ('Subscript', (1, 14, 1, 29), ('Name', (1, 14, 1, 19), 'tuple', ('Load',)), ('Tuple', (1, 20, 1, 28), [('Name', (1, 20, 1, 23), 'int', ('Load',)), ('Starred', (1, 25, 1, 28), ('Name', (1, 26, 1, 28), 'Ts', ('Load',)), ('Load',))], ('Load',)), ('Load',)), ('Load',)), None), [], [], None, []), [('Pass', (1, 32, 1, 36))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 21), 'f', ('arguments', [], [], None, [], [], ('arg', (1, 8, 1, 14), 'kwargs', None, None), []), [('Pass', (1, 17, 1, 21))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 71), 'f', ('arguments', [], [('arg', (1, 6, 1, 7), 'a', None, None), ('arg', (1, 9, 1, 10), 'b', None, None), ('arg', (1, 14, 1, 15), 'c', None, None), ('arg', (1, 22, 1, 23), 'd', None, None), ('arg', (1, 28, 1, 29), 'e', None, None)], ('arg', (1, 35, 1, 39), 'args', None, None), [('arg', (1, 41, 1, 42), 'f', None, None)], [('Constant', (1, 43, 1, 45), 42, None)], ('arg', (1, 49, 1, 55), 'kwargs', None, None), [('Constant', (1, 11, 1, 12), 1, None), ('Constant', (1, 16, 1, 20), None, None), ('List', (1, 24, 1, 26), [], ('Load',)), ('Dict', (1, 30, 1, 32), [], [])]), [('Expr', (1, 58, 1, 71), ('Constant', (1, 58, 1, 71), 'doc for f()', None))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 27), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 23, 1, 27))], [], ('Subscript', (1, 11, 1, 21), ('Name', (1, 11, 1, 16), 'tuple', ('Load',)), ('Tuple', (1, 17, 1, 20), [('Starred', (1, 17, 1, 20), ('Name', (1, 18, 1, 20), 'Ts', ('Load',)), ('Load',))], ('Load',)), ('Load',)), None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 32), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 28, 1, 32))], [], ('Subscript', (1, 11, 1, 26), ('Name', (1, 11, 1, 16), 'tuple', ('Load',)), ('Tuple', (1, 17, 1, 25), [('Name', (1, 17, 1, 20), 'int', ('Load',)), ('Starred', (1, 22, 1, 25), ('Name', (1, 23, 1, 25), 'Ts', ('Load',)), ('Load',))], ('Load',)), ('Load',)), None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 45), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 41, 1, 45))], [], ('Subscript', (1, 11, 1, 39), ('Name', (1, 11, 1, 16), 'tuple', ('Load',)), ('Tuple', (1, 17, 1, 38), [('Name', (1, 17, 1, 20), 'int', ('Load',)), ('Starred', (1, 22, 1, 38), ('Subscript', (1, 23, 1, 38), ('Name', (1, 23, 1, 28), 'tuple', ('Load',)), ('Tuple', (1, 29, 1, 37), [('Name', (1, 29, 1, 32), 'int', ('Load',)), ('Constant', (1, 34, 1, 37), Ellipsis, None)], ('Load',)), ('Load',)), ('Load',))], ('Load',)), ('Load',)), None)], []),
-('Module', [('ClassDef', (1, 0, 1, 12), 'C', [], [], [('Pass', (1, 8, 1, 12))], [])], []),
-('Module', [('ClassDef', (1, 0, 1, 32), 'C', [], [], [('Expr', (1, 9, 1, 32), ('Constant', (1, 9, 1, 32), 'docstring for class C', None))], [])], []),
-('Module', [('ClassDef', (1, 0, 1, 21), 'C', [('Name', (1, 8, 1, 14), 'object', ('Load',))], [], [('Pass', (1, 17, 1, 21))], [])], []),
-('Module', [('FunctionDef', (1, 0, 1, 16), 'f', ('arguments', [], [], None, [], [], None, []), [('Return', (1, 8, 1, 16), ('Constant', (1, 15, 1, 16), 1, None))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 13), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 9, 1, 13))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 29), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Expr', (1, 9, 1, 29), ('Constant', (1, 9, 1, 29), 'function docstring', None))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 14), 'f', [], ('arguments', [], [('arg', (1, 6, 1, 7), 'a', None, None)], None, [], [], None, []), [('Pass', (1, 10, 1, 14))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 16), 'f', [], ('arguments', [], [('arg', (1, 6, 1, 7), 'a', None, None)], None, [], [], None, [('Constant', (1, 8, 1, 9), 0, None)]), [('Pass', (1, 12, 1, 16))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 18), 'f', [], ('arguments', [], [], ('arg', (1, 7, 1, 11), 'args', None, None), [], [], None, []), [('Pass', (1, 14, 1, 18))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 23), 'f', [], ('arguments', [], [], ('arg', (1, 7, 1, 16), 'args', ('Starred', (1, 13, 1, 16), ('Name', (1, 14, 1, 16), 'Ts', ('Load',)), ('Load',)), None), [], [], None, []), [('Pass', (1, 19, 1, 23))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 36), 'f', [], ('arguments', [], [], ('arg', (1, 7, 1, 29), 'args', ('Starred', (1, 13, 1, 29), ('Subscript', (1, 14, 1, 29), ('Name', (1, 14, 1, 19), 'tuple', ('Load',)), ('Tuple', (1, 20, 1, 28), [('Name', (1, 20, 1, 23), 'int', ('Load',)), ('Constant', (1, 25, 1, 28), Ellipsis, None)], ('Load',)), ('Load',)), ('Load',)), None), [], [], None, []), [('Pass', (1, 32, 1, 36))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 36), 'f', [], ('arguments', [], [], ('arg', (1, 7, 1, 29), 'args', ('Starred', (1, 13, 1, 29), ('Subscript', (1, 14, 1, 29), ('Name', (1, 14, 1, 19), 'tuple', ('Load',)), ('Tuple', (1, 20, 1, 28), [('Name', (1, 20, 1, 23), 'int', ('Load',)), ('Starred', (1, 25, 1, 28), ('Name', (1, 26, 1, 28), 'Ts', ('Load',)), ('Load',))], ('Load',)), ('Load',)), ('Load',)), None), [], [], None, []), [('Pass', (1, 32, 1, 36))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 21), 'f', [], ('arguments', [], [], None, [], [], ('arg', (1, 8, 1, 14), 'kwargs', None, None), []), [('Pass', (1, 17, 1, 21))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 71), 'f', [], ('arguments', [], [('arg', (1, 6, 1, 7), 'a', None, None), ('arg', (1, 9, 1, 10), 'b', None, None), ('arg', (1, 14, 1, 15), 'c', None, None), ('arg', (1, 22, 1, 23), 'd', None, None), ('arg', (1, 28, 1, 29), 'e', None, None)], ('arg', (1, 35, 1, 39), 'args', None, None), [('arg', (1, 41, 1, 42), 'f', None, None)], [('Constant', (1, 43, 1, 45), 42, None)], ('arg', (1, 49, 1, 55), 'kwargs', None, None), [('Constant', (1, 11, 1, 12), 1, None), ('Constant', (1, 16, 1, 20), None, None), ('List', (1, 24, 1, 26), [], ('Load',)), ('Dict', (1, 30, 1, 32), [], [])]), [('Expr', (1, 58, 1, 71), ('Constant', (1, 58, 1, 71), 'doc for f()', None))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 27), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 23, 1, 27))], [], ('Subscript', (1, 11, 1, 21), ('Name', (1, 11, 1, 16), 'tuple', ('Load',)), ('Tuple', (1, 17, 1, 20), [('Starred', (1, 17, 1, 20), ('Name', (1, 18, 1, 20), 'Ts', ('Load',)), ('Load',))], ('Load',)), ('Load',)), None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 32), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 28, 1, 32))], [], ('Subscript', (1, 11, 1, 26), ('Name', (1, 11, 1, 16), 'tuple', ('Load',)), ('Tuple', (1, 17, 1, 25), [('Name', (1, 17, 1, 20), 'int', ('Load',)), ('Starred', (1, 22, 1, 25), ('Name', (1, 23, 1, 25), 'Ts', ('Load',)), ('Load',))], ('Load',)), ('Load',)), None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 45), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 41, 1, 45))], [], ('Subscript', (1, 11, 1, 39), ('Name', (1, 11, 1, 16), 'tuple', ('Load',)), ('Tuple', (1, 17, 1, 38), [('Name', (1, 17, 1, 20), 'int', ('Load',)), ('Starred', (1, 22, 1, 38), ('Subscript', (1, 23, 1, 38), ('Name', (1, 23, 1, 28), 'tuple', ('Load',)), ('Tuple', (1, 29, 1, 37), [('Name', (1, 29, 1, 32), 'int', ('Load',)), ('Constant', (1, 34, 1, 37), Ellipsis, None)], ('Load',)), ('Load',)), ('Load',))], ('Load',)), ('Load',)), None)], []),
+('Module', [('ClassDef', (1, 0, 1, 12), 'C', [], [], [], [('Pass', (1, 8, 1, 12))], [])], []),
+('Module', [('ClassDef', (1, 0, 1, 32), 'C', [], [], [], [('Expr', (1, 9, 1, 32), ('Constant', (1, 9, 1, 32), 'docstring for class C', None))], [])], []),
+('Module', [('ClassDef', (1, 0, 1, 21), 'C', [], [('Name', (1, 8, 1, 14), 'object', ('Load',))], [], [('Pass', (1, 17, 1, 21))], [])], []),
+('Module', [('FunctionDef', (1, 0, 1, 16), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Return', (1, 8, 1, 16), ('Constant', (1, 15, 1, 16), 1, None))], [], None, None)], []),
('Module', [('Delete', (1, 0, 1, 5), [('Name', (1, 4, 1, 5), 'v', ('Del',))])], []),
('Module', [('Assign', (1, 0, 1, 5), [('Name', (1, 0, 1, 1), 'v', ('Store',))], ('Constant', (1, 4, 1, 5), 1, None), None)], []),
('Module', [('Assign', (1, 0, 1, 7), [('Tuple', (1, 0, 1, 3), [('Name', (1, 0, 1, 1), 'a', ('Store',)), ('Name', (1, 2, 1, 3), 'b', ('Store',))], ('Store',))], ('Name', (1, 6, 1, 7), 'c', ('Load',)), None)], []),
@@ -2922,28 +2948,41 @@ def main():
('Module', [('Expr', (1, 0, 1, 20), ('DictComp', (1, 0, 1, 20), ('Name', (1, 1, 1, 2), 'a', ('Load',)), ('Name', (1, 5, 1, 6), 'b', ('Load',)), [('comprehension', ('Tuple', (1, 11, 1, 14), [('Name', (1, 11, 1, 12), 'v', ('Store',)), ('Name', (1, 13, 1, 14), 'w', ('Store',))], ('Store',)), ('Name', (1, 18, 1, 19), 'x', ('Load',)), [], 0)]))], []),
('Module', [('Expr', (1, 0, 1, 19), ('SetComp', (1, 0, 1, 19), ('Name', (1, 1, 1, 2), 'r', ('Load',)), [('comprehension', ('Name', (1, 7, 1, 8), 'l', ('Store',)), ('Name', (1, 12, 1, 13), 'x', ('Load',)), [('Name', (1, 17, 1, 18), 'g', ('Load',))], 0)]))], []),
('Module', [('Expr', (1, 0, 1, 16), ('SetComp', (1, 0, 1, 16), ('Name', (1, 1, 1, 2), 'r', ('Load',)), [('comprehension', ('Tuple', (1, 7, 1, 10), [('Name', (1, 7, 1, 8), 'l', ('Store',)), ('Name', (1, 9, 1, 10), 'm', ('Store',))], ('Store',)), ('Name', (1, 14, 1, 15), 'x', ('Load',)), [], 0)]))], []),
-('Module', [('AsyncFunctionDef', (1, 0, 3, 18), 'f', ('arguments', [], [], None, [], [], None, []), [('Expr', (2, 1, 2, 17), ('Constant', (2, 1, 2, 17), 'async function', None)), ('Expr', (3, 1, 3, 18), ('Await', (3, 1, 3, 18), ('Call', (3, 7, 3, 18), ('Name', (3, 7, 3, 16), 'something', ('Load',)), [], [])))], [], None, None)], []),
-('Module', [('AsyncFunctionDef', (1, 0, 3, 8), 'f', ('arguments', [], [], None, [], [], None, []), [('AsyncFor', (2, 1, 3, 8), ('Name', (2, 11, 2, 12), 'e', ('Store',)), ('Name', (2, 16, 2, 17), 'i', ('Load',)), [('Expr', (2, 19, 2, 20), ('Constant', (2, 19, 2, 20), 1, None))], [('Expr', (3, 7, 3, 8), ('Constant', (3, 7, 3, 8), 2, None))], None)], [], None, None)], []),
-('Module', [('AsyncFunctionDef', (1, 0, 2, 21), 'f', ('arguments', [], [], None, [], [], None, []), [('AsyncWith', (2, 1, 2, 21), [('withitem', ('Name', (2, 12, 2, 13), 'a', ('Load',)), ('Name', (2, 17, 2, 18), 'b', ('Store',)))], [('Expr', (2, 20, 2, 21), ('Constant', (2, 20, 2, 21), 1, None))], None)], [], None, None)], []),
+('Module', [('AsyncFunctionDef', (1, 0, 3, 18), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Expr', (2, 1, 2, 17), ('Constant', (2, 1, 2, 17), 'async function', None)), ('Expr', (3, 1, 3, 18), ('Await', (3, 1, 3, 18), ('Call', (3, 7, 3, 18), ('Name', (3, 7, 3, 16), 'something', ('Load',)), [], [])))], [], None, None)], []),
+('Module', [('AsyncFunctionDef', (1, 0, 3, 8), 'f', [], ('arguments', [], [], None, [], [], None, []), [('AsyncFor', (2, 1, 3, 8), ('Name', (2, 11, 2, 12), 'e', ('Store',)), ('Name', (2, 16, 2, 17), 'i', ('Load',)), [('Expr', (2, 19, 2, 20), ('Constant', (2, 19, 2, 20), 1, None))], [('Expr', (3, 7, 3, 8), ('Constant', (3, 7, 3, 8), 2, None))], None)], [], None, None)], []),
+('Module', [('AsyncFunctionDef', (1, 0, 2, 21), 'f', [], ('arguments', [], [], None, [], [], None, []), [('AsyncWith', (2, 1, 2, 21), [('withitem', ('Name', (2, 12, 2, 13), 'a', ('Load',)), ('Name', (2, 17, 2, 18), 'b', ('Store',)))], [('Expr', (2, 20, 2, 21), ('Constant', (2, 20, 2, 21), 1, None))], None)], [], None, None)], []),
('Module', [('Expr', (1, 0, 1, 14), ('Dict', (1, 0, 1, 14), [None, ('Constant', (1, 10, 1, 11), 2, None)], [('Dict', (1, 3, 1, 8), [('Constant', (1, 4, 1, 5), 1, None)], [('Constant', (1, 6, 1, 7), 2, None)]), ('Constant', (1, 12, 1, 13), 3, None)]))], []),
('Module', [('Expr', (1, 0, 1, 12), ('Set', (1, 0, 1, 12), [('Starred', (1, 1, 1, 8), ('Set', (1, 2, 1, 8), [('Constant', (1, 3, 1, 4), 1, None), ('Constant', (1, 6, 1, 7), 2, None)]), ('Load',)), ('Constant', (1, 10, 1, 11), 3, None)]))], []),
-('Module', [('AsyncFunctionDef', (1, 0, 2, 21), 'f', ('arguments', [], [], None, [], [], None, []), [('Expr', (2, 1, 2, 21), ('ListComp', (2, 1, 2, 21), ('Name', (2, 2, 2, 3), 'i', ('Load',)), [('comprehension', ('Name', (2, 14, 2, 15), 'b', ('Store',)), ('Name', (2, 19, 2, 20), 'c', ('Load',)), [], 1)]))], [], None, None)], []),
-('Module', [('FunctionDef', (4, 0, 4, 13), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (4, 9, 4, 13))], [('Name', (1, 1, 1, 6), 'deco1', ('Load',)), ('Call', (2, 1, 2, 8), ('Name', (2, 1, 2, 6), 'deco2', ('Load',)), [], []), ('Call', (3, 1, 3, 9), ('Name', (3, 1, 3, 6), 'deco3', ('Load',)), [('Constant', (3, 7, 3, 8), 1, None)], [])], None, None)], []),
-('Module', [('AsyncFunctionDef', (4, 0, 4, 19), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (4, 15, 4, 19))], [('Name', (1, 1, 1, 6), 'deco1', ('Load',)), ('Call', (2, 1, 2, 8), ('Name', (2, 1, 2, 6), 'deco2', ('Load',)), [], []), ('Call', (3, 1, 3, 9), ('Name', (3, 1, 3, 6), 'deco3', ('Load',)), [('Constant', (3, 7, 3, 8), 1, None)], [])], None, None)], []),
-('Module', [('ClassDef', (4, 0, 4, 13), 'C', [], [], [('Pass', (4, 9, 4, 13))], [('Name', (1, 1, 1, 6), 'deco1', ('Load',)), ('Call', (2, 1, 2, 8), ('Name', (2, 1, 2, 6), 'deco2', ('Load',)), [], []), ('Call', (3, 1, 3, 9), ('Name', (3, 1, 3, 6), 'deco3', ('Load',)), [('Constant', (3, 7, 3, 8), 1, None)], [])])], []),
-('Module', [('FunctionDef', (2, 0, 2, 13), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (2, 9, 2, 13))], [('Call', (1, 1, 1, 19), ('Name', (1, 1, 1, 5), 'deco', ('Load',)), [('GeneratorExp', (1, 5, 1, 19), ('Name', (1, 6, 1, 7), 'a', ('Load',)), [('comprehension', ('Name', (1, 12, 1, 13), 'a', ('Store',)), ('Name', (1, 17, 1, 18), 'b', ('Load',)), [], 0)])], [])], None, None)], []),
-('Module', [('FunctionDef', (2, 0, 2, 13), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (2, 9, 2, 13))], [('Attribute', (1, 1, 1, 6), ('Attribute', (1, 1, 1, 4), ('Name', (1, 1, 1, 2), 'a', ('Load',)), 'b', ('Load',)), 'c', ('Load',))], None, None)], []),
+('Module', [('AsyncFunctionDef', (1, 0, 2, 21), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Expr', (2, 1, 2, 21), ('ListComp', (2, 1, 2, 21), ('Name', (2, 2, 2, 3), 'i', ('Load',)), [('comprehension', ('Name', (2, 14, 2, 15), 'b', ('Store',)), ('Name', (2, 19, 2, 20), 'c', ('Load',)), [], 1)]))], [], None, None)], []),
+('Module', [('FunctionDef', (4, 0, 4, 13), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (4, 9, 4, 13))], [('Name', (1, 1, 1, 6), 'deco1', ('Load',)), ('Call', (2, 1, 2, 8), ('Name', (2, 1, 2, 6), 'deco2', ('Load',)), [], []), ('Call', (3, 1, 3, 9), ('Name', (3, 1, 3, 6), 'deco3', ('Load',)), [('Constant', (3, 7, 3, 8), 1, None)], [])], None, None)], []),
+('Module', [('AsyncFunctionDef', (4, 0, 4, 19), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (4, 15, 4, 19))], [('Name', (1, 1, 1, 6), 'deco1', ('Load',)), ('Call', (2, 1, 2, 8), ('Name', (2, 1, 2, 6), 'deco2', ('Load',)), [], []), ('Call', (3, 1, 3, 9), ('Name', (3, 1, 3, 6), 'deco3', ('Load',)), [('Constant', (3, 7, 3, 8), 1, None)], [])], None, None)], []),
+('Module', [('ClassDef', (4, 0, 4, 13), 'C', [], [], [], [('Pass', (4, 9, 4, 13))], [('Name', (1, 1, 1, 6), 'deco1', ('Load',)), ('Call', (2, 1, 2, 8), ('Name', (2, 1, 2, 6), 'deco2', ('Load',)), [], []), ('Call', (3, 1, 3, 9), ('Name', (3, 1, 3, 6), 'deco3', ('Load',)), [('Constant', (3, 7, 3, 8), 1, None)], [])])], []),
+('Module', [('FunctionDef', (2, 0, 2, 13), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (2, 9, 2, 13))], [('Call', (1, 1, 1, 19), ('Name', (1, 1, 1, 5), 'deco', ('Load',)), [('GeneratorExp', (1, 5, 1, 19), ('Name', (1, 6, 1, 7), 'a', ('Load',)), [('comprehension', ('Name', (1, 12, 1, 13), 'a', ('Store',)), ('Name', (1, 17, 1, 18), 'b', ('Load',)), [], 0)])], [])], None, None)], []),
+('Module', [('FunctionDef', (2, 0, 2, 13), 'f', [], ('arguments', [], [], None, [], [], None, []), [('Pass', (2, 9, 2, 13))], [('Attribute', (1, 1, 1, 6), ('Attribute', (1, 1, 1, 4), ('Name', (1, 1, 1, 2), 'a', ('Load',)), 'b', ('Load',)), 'c', ('Load',))], None, None)], []),
('Module', [('Expr', (1, 0, 1, 8), ('NamedExpr', (1, 1, 1, 7), ('Name', (1, 1, 1, 2), 'a', ('Store',)), ('Constant', (1, 6, 1, 7), 1, None)))], []),
-('Module', [('FunctionDef', (1, 0, 1, 18), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [], None, [], [], None, []), [('Pass', (1, 14, 1, 18))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 26), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 12, 1, 13), 'c', None, None), ('arg', (1, 15, 1, 16), 'd', None, None), ('arg', (1, 18, 1, 19), 'e', None, None)], None, [], [], None, []), [('Pass', (1, 22, 1, 26))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 29), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 12, 1, 13), 'c', None, None)], None, [('arg', (1, 18, 1, 19), 'd', None, None), ('arg', (1, 21, 1, 22), 'e', None, None)], [None, None], None, []), [('Pass', (1, 25, 1, 29))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 39), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 12, 1, 13), 'c', None, None)], None, [('arg', (1, 18, 1, 19), 'd', None, None), ('arg', (1, 21, 1, 22), 'e', None, None)], [None, None], ('arg', (1, 26, 1, 32), 'kwargs', None, None), []), [('Pass', (1, 35, 1, 39))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 20), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [], None, [], [], None, [('Constant', (1, 8, 1, 9), 1, None)]), [('Pass', (1, 16, 1, 20))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 29), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None), ('arg', (1, 19, 1, 20), 'c', None, None)], None, [], [], None, [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None), ('Constant', (1, 21, 1, 22), 4, None)]), [('Pass', (1, 25, 1, 29))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 32), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [('Constant', (1, 24, 1, 25), 4, None)], None, [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 28, 1, 32))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 30), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [None], None, [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 26, 1, 30))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 42), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [('Constant', (1, 24, 1, 25), 4, None)], ('arg', (1, 29, 1, 35), 'kwargs', None, None), [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 38, 1, 42))], [], None, None)], []),
-('Module', [('FunctionDef', (1, 0, 1, 40), 'f', ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [None], ('arg', (1, 27, 1, 33), 'kwargs', None, None), [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 36, 1, 40))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 18), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [], None, [], [], None, []), [('Pass', (1, 14, 1, 18))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 26), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 12, 1, 13), 'c', None, None), ('arg', (1, 15, 1, 16), 'd', None, None), ('arg', (1, 18, 1, 19), 'e', None, None)], None, [], [], None, []), [('Pass', (1, 22, 1, 26))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 29), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 12, 1, 13), 'c', None, None)], None, [('arg', (1, 18, 1, 19), 'd', None, None), ('arg', (1, 21, 1, 22), 'e', None, None)], [None, None], None, []), [('Pass', (1, 25, 1, 29))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 39), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 12, 1, 13), 'c', None, None)], None, [('arg', (1, 18, 1, 19), 'd', None, None), ('arg', (1, 21, 1, 22), 'e', None, None)], [None, None], ('arg', (1, 26, 1, 32), 'kwargs', None, None), []), [('Pass', (1, 35, 1, 39))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 20), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [], None, [], [], None, [('Constant', (1, 8, 1, 9), 1, None)]), [('Pass', (1, 16, 1, 20))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 29), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None), ('arg', (1, 19, 1, 20), 'c', None, None)], None, [], [], None, [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None), ('Constant', (1, 21, 1, 22), 4, None)]), [('Pass', (1, 25, 1, 29))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 32), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [('Constant', (1, 24, 1, 25), 4, None)], None, [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 28, 1, 32))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 30), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [None], None, [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 26, 1, 30))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 42), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [('Constant', (1, 24, 1, 25), 4, None)], ('arg', (1, 29, 1, 35), 'kwargs', None, None), [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 38, 1, 42))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 40), 'f', [], ('arguments', [('arg', (1, 6, 1, 7), 'a', None, None)], [('arg', (1, 14, 1, 15), 'b', None, None)], None, [('arg', (1, 22, 1, 23), 'c', None, None)], [None], ('arg', (1, 27, 1, 33), 'kwargs', None, None), [('Constant', (1, 8, 1, 9), 1, None), ('Constant', (1, 16, 1, 17), 2, None)]), [('Pass', (1, 36, 1, 40))], [], None, None)], []),
+('Module', [('TypeAlias', (1, 0, 1, 12), ('Name', (1, 5, 1, 6), 'X', ('Store',)), [], ('Name', (1, 9, 1, 12), 'int', ('Load',)))], []),
+('Module', [('TypeAlias', (1, 0, 1, 15), ('Name', (1, 5, 1, 6), 'X', ('Store',)), [('TypeVar', (1, 7, 1, 8), 'T', None)], ('Name', (1, 12, 1, 15), 'int', ('Load',)))], []),
+('Module', [('TypeAlias', (1, 0, 1, 32), ('Name', (1, 5, 1, 6), 'X', ('Store',)), [('TypeVar', (1, 7, 1, 8), 'T', None), ('TypeVarTuple', (1, 10, 1, 13), 'Ts'), ('ParamSpec', (1, 15, 1, 18), 'P')], ('Tuple', (1, 22, 1, 32), [('Name', (1, 23, 1, 24), 'T', ('Load',)), ('Name', (1, 26, 1, 28), 'Ts', ('Load',)), ('Name', (1, 30, 1, 31), 'P', ('Load',))], ('Load',)))], []),
+('Module', [('TypeAlias', (1, 0, 1, 37), ('Name', (1, 5, 1, 6), 'X', ('Store',)), [('TypeVar', (1, 7, 1, 13), 'T', ('Name', (1, 10, 1, 13), 'int', ('Load',))), ('TypeVarTuple', (1, 15, 1, 18), 'Ts'), ('ParamSpec', (1, 20, 1, 23), 'P')], ('Tuple', (1, 27, 1, 37), [('Name', (1, 28, 1, 29), 'T', ('Load',)), ('Name', (1, 31, 1, 33), 'Ts', ('Load',)), ('Name', (1, 35, 1, 36), 'P', ('Load',))], ('Load',)))], []),
+('Module', [('TypeAlias', (1, 0, 1, 44), ('Name', (1, 5, 1, 6), 'X', ('Store',)), [('TypeVar', (1, 7, 1, 20), 'T', ('Tuple', (1, 10, 1, 20), [('Name', (1, 11, 1, 14), 'int', ('Load',)), ('Name', (1, 16, 1, 19), 'str', ('Load',))], ('Load',))), ('TypeVarTuple', (1, 22, 1, 25), 'Ts'), ('ParamSpec', (1, 27, 1, 30), 'P')], ('Tuple', (1, 34, 1, 44), [('Name', (1, 35, 1, 36), 'T', ('Load',)), ('Name', (1, 38, 1, 40), 'Ts', ('Load',)), ('Name', (1, 42, 1, 43), 'P', ('Load',))], ('Load',)))], []),
+('Module', [('ClassDef', (1, 0, 1, 16), 'X', [('TypeVar', (1, 8, 1, 9), 'T', None)], [], [], [('Pass', (1, 12, 1, 16))], [])], []),
+('Module', [('ClassDef', (1, 0, 1, 26), 'X', [('TypeVar', (1, 8, 1, 9), 'T', None), ('TypeVarTuple', (1, 11, 1, 14), 'Ts'), ('ParamSpec', (1, 16, 1, 19), 'P')], [], [], [('Pass', (1, 22, 1, 26))], [])], []),
+('Module', [('ClassDef', (1, 0, 1, 31), 'X', [('TypeVar', (1, 8, 1, 14), 'T', ('Name', (1, 11, 1, 14), 'int', ('Load',))), ('TypeVarTuple', (1, 16, 1, 19), 'Ts'), ('ParamSpec', (1, 21, 1, 24), 'P')], [], [], [('Pass', (1, 27, 1, 31))], [])], []),
+('Module', [('ClassDef', (1, 0, 1, 38), 'X', [('TypeVar', (1, 8, 1, 21), 'T', ('Tuple', (1, 11, 1, 21), [('Name', (1, 12, 1, 15), 'int', ('Load',)), ('Name', (1, 17, 1, 20), 'str', ('Load',))], ('Load',))), ('TypeVarTuple', (1, 23, 1, 26), 'Ts'), ('ParamSpec', (1, 28, 1, 31), 'P')], [], [], [('Pass', (1, 34, 1, 38))], [])], []),
+('Module', [('FunctionDef', (1, 0, 1, 16), 'f', [('TypeVar', (1, 6, 1, 7), 'T', None)], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 12, 1, 16))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 26), 'f', [('TypeVar', (1, 6, 1, 7), 'T', None), ('TypeVarTuple', (1, 9, 1, 12), 'Ts'), ('ParamSpec', (1, 14, 1, 17), 'P')], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 22, 1, 26))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 31), 'f', [('TypeVar', (1, 6, 1, 12), 'T', ('Name', (1, 9, 1, 12), 'int', ('Load',))), ('TypeVarTuple', (1, 14, 1, 17), 'Ts'), ('ParamSpec', (1, 19, 1, 22), 'P')], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 27, 1, 31))], [], None, None)], []),
+('Module', [('FunctionDef', (1, 0, 1, 38), 'f', [('TypeVar', (1, 6, 1, 19), 'T', ('Tuple', (1, 9, 1, 19), [('Name', (1, 10, 1, 13), 'int', ('Load',)), ('Name', (1, 15, 1, 18), 'str', ('Load',))], ('Load',))), ('TypeVarTuple', (1, 21, 1, 24), 'Ts'), ('ParamSpec', (1, 26, 1, 29), 'P')], ('arguments', [], [], None, [], [], None, []), [('Pass', (1, 34, 1, 38))], [], None, None)], []),
]
single_results = [
('Interactive', [('Expr', (1, 0, 1, 3), ('BinOp', (1, 0, 1, 3), ('Constant', (1, 0, 1, 1), 1, None), ('Add',), ('Constant', (1, 2, 1, 3), 2, None)))]),
diff --git a/Lib/test/test_keyword.py b/Lib/test/test_keyword.py
index f329f88fa0..858e5de3b9 100644
--- a/Lib/test/test_keyword.py
+++ b/Lib/test/test_keyword.py
@@ -39,7 +39,8 @@ def test_async_and_await_are_keywords(self):
self.assertIn("async", keyword.kwlist)
self.assertIn("await", keyword.kwlist)
- def test_match_and_case_are_soft_keywords(self):
+ def test_soft_keywords(self):
+ self.assertIn("type", keyword.softkwlist)
self.assertIn("match", keyword.softkwlist)
self.assertIn("case", keyword.softkwlist)
self.assertIn("_", keyword.softkwlist)
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index e1db450bf8..d81501f6f1 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -1449,7 +1449,7 @@ def func():
check(x, size('3Pi3c7P2ic??2P'))
# function
def func(): pass
- check(func, size('14Pi'))
+ check(func, size('15Pi'))
class c():
@staticmethod
def foo():
diff --git a/Lib/test/test_type_aliases.py b/Lib/test/test_type_aliases.py
new file mode 100644
index 0000000..efec4db
--- /dev/null
+++ b/Lib/test/test_type_aliases.py
@@ -0,0 +1,204 @@
+import types
+import unittest
+from test.support import check_syntax_error, run_code
+
+from typing import Callable, TypeAliasType, TypeVar, get_args
+
+
+class TypeParamsInvalidTest(unittest.TestCase):
+ def test_name_collision_01(self):
+ check_syntax_error(self, """type TA1[A, **A] = None""")
+
+ def test_name_non_collision_02(self):
+ ns = run_code("""type TA1[A] = lambda A: A""")
+ self.assertIsInstance(ns["TA1"], TypeAliasType)
+ self.assertTrue(callable(ns["TA1"].__value__))
+ self.assertEqual("arg", ns["TA1"].__value__("arg"))
+
+ def test_name_non_collision_03(self):
+ ns = run_code("""
+ class Outer[A]:
+ type TA1[A] = None
+ """
+ )
+ outer_A, = ns["Outer"].__type_params__
+ inner_A, = ns["Outer"].TA1.__type_params__
+ self.assertIsNot(outer_A, inner_A)
+
+
+class TypeParamsAccessTest(unittest.TestCase):
+ def test_alias_access_01(self):
+ ns = run_code("type TA1[A, B] = dict[A, B]")
+ alias = ns["TA1"]
+ self.assertIsInstance(alias, TypeAliasType)
+ self.assertEqual(alias.__type_params__, get_args(alias.__value__))
+
+ def test_alias_access_02(self):
+ ns = run_code("""
+ type TA1[A, B] = TA1[A, B] | int
+ """
+ )
+ alias = ns["TA1"]
+ self.assertIsInstance(alias, TypeAliasType)
+ A, B = alias.__type_params__
+ self.assertEqual(alias.__value__, alias[A, B] | int)
+
+ def test_alias_access_03(self):
+ ns = run_code("""
+ class Outer[A]:
+ def inner[B](self):
+ type TA1[C] = TA1[A, B] | int
+ return TA1
+ """
+ )
+ cls = ns["Outer"]
+ A, = cls.__type_params__
+ B, = cls.inner.__type_params__
+ alias = cls.inner(None)
+ self.assertIsInstance(alias, TypeAliasType)
+ alias2 = cls.inner(None)
+ self.assertIsNot(alias, alias2)
+ self.assertEqual(len(alias.__type_params__), 1)
+
+ self.assertEqual(alias.__value__, alias[A, B] | int)
+
+
+class TypeParamsAliasValueTest(unittest.TestCase):
+ def test_alias_value_01(self):
+ type TA1 = int
+
+ self.assertIsInstance(TA1, TypeAliasType)
+ self.assertEqual(TA1.__value__, int)
+ self.assertEqual(TA1.__parameters__, ())
+ self.assertEqual(TA1.__type_params__, ())
+
+ type TA2 = TA1 | str
+
+ self.assertIsInstance(TA2, TypeAliasType)
+ a, b = TA2.__value__.__args__
+ self.assertEqual(a, TA1)
+ self.assertEqual(b, str)
+ self.assertEqual(TA2.__parameters__, ())
+ self.assertEqual(TA2.__type_params__, ())
+
+ def test_alias_value_02(self):
+ class Parent[A]:
+ type TA1[B] = dict[A, B]
+
+ self.assertIsInstance(Parent.TA1, TypeAliasType)
+ self.assertEqual(len(Parent.TA1.__parameters__), 1)
+ self.assertEqual(len(Parent.__parameters__), 1)
+ a, = Parent.__parameters__
+ b, = Parent.TA1.__parameters__
+ self.assertEqual(Parent.__type_params__, (a,))
+ self.assertEqual(Parent.TA1.__type_params__, (b,))
+ self.assertEqual(Parent.TA1.__value__, dict[a, b])
+
+ def test_alias_value_03(self):
+ def outer[A]():
+ type TA1[B] = dict[A, B]
+ return TA1
+
+ o = outer()
+ self.assertIsInstance(o, TypeAliasType)
+ self.assertEqual(len(o.__parameters__), 1)
+ self.assertEqual(len(outer.__type_params__), 1)
+ b = o.__parameters__[0]
+ self.assertEqual(o.__type_params__, (b,))
+
+ def test_alias_value_04(self):
+ def more_generic[T, *Ts, **P]():
+ type TA[T2, *Ts2, **P2] = tuple[Callable[P, tuple[T, *Ts]], Callable[P2, tuple[T2, *Ts2]]]
+ return TA
+
+ alias = more_generic()
+ self.assertIsInstance(alias, TypeAliasType)
+ T2, Ts2, P2 = alias.__type_params__
+ self.assertEqual(alias.__parameters__, (T2, *Ts2, P2))
+ T, Ts, P = more_generic.__type_params__
+ self.assertEqual(alias.__value__, tuple[Callable[P, tuple[T, *Ts]], Callable[P2, tuple[T2, *Ts2]]])
+
+ def test_subscripting(self):
+ type NonGeneric = int
+ type Generic[A] = dict[A, A]
+ type VeryGeneric[T, *Ts, **P] = Callable[P, tuple[T, *Ts]]
+
+ with self.assertRaises(TypeError):
+ NonGeneric[int]
+
+ specialized = Generic[int]
+ self.assertIsInstance(specialized, types.GenericAlias)
+ self.assertIs(specialized.__origin__, Generic)
+ self.assertEqual(specialized.__args__, (int,))
+
+ specialized2 = VeryGeneric[int, str, float, [bool, range]]
+ self.assertIsInstance(specialized2, types.GenericAlias)
+ self.assertIs(specialized2.__origin__, VeryGeneric)
+ self.assertEqual(specialized2.__args__, (int, str, float, [bool, range]))
+
+ def test_repr(self):
+ type Simple = int
+ self.assertEqual(repr(Simple), "Simple")
+
+ def test_recursive_repr(self):
+ type Recursive = Recursive
+ self.assertEqual(repr(Recursive), "Recursive")
+
+ type X = list[Y]
+ type Y = list[X]
+ self.assertEqual(repr(X), "X")
+
+
+class TypeAliasConstructorTest(unittest.TestCase):
+ def test_basic(self):
+ TA = TypeAliasType("TA", int)
+ self.assertEqual(TA.__name__, "TA")
+ self.assertIs(TA.__value__, int)
+ self.assertEqual(TA.__type_params__, ())
+
+ def test_generic(self):
+ T = TypeVar("T")
+ TA = TypeAliasType("TA", list[T], type_params=(T,))
+ self.assertEqual(TA.__name__, "TA")
+ self.assertEqual(TA.__value__, list[T])
+ self.assertEqual(TA.__type_params__, (T,))
+
+ def test_keywords(self):
+ TA = TypeAliasType(name="TA", value=int)
+ self.assertEqual(TA.__name__, "TA")
+ self.assertIs(TA.__value__, int)
+ self.assertEqual(TA.__type_params__, ())
+
+ def test_errors(self):
+ with self.assertRaises(TypeError):
+ TypeAliasType()
+ with self.assertRaises(TypeError):
+ TypeAliasType("TA")
+ with self.assertRaises(TypeError):
+ TypeAliasType("TA", list, ())
+ with self.assertRaises(TypeError):
+ TypeAliasType("TA", list, type_params=42)
+
+
+class TypeAliasTypeTest(unittest.TestCase):
+ def test_immutable(self):
+ with self.assertRaises(TypeError):
+ TypeAliasType.whatever = "not allowed"
+
+ def test_no_subclassing(self):
+ with self.assertRaisesRegex(TypeError, "not an acceptable base type"):
+ class MyAlias(TypeAliasType):
+ pass
+
+ def test_union(self):
+ type Alias1 = int
+ type Alias2 = str
+ union = Alias1 | Alias2
+ self.assertIsInstance(union, types.UnionType)
+ self.assertEqual(get_args(union), (Alias1, Alias2))
+ union2 = Alias1 | list[float]
+ self.assertIsInstance(union2, types.UnionType)
+ self.assertEqual(get_args(union2), (Alias1, list[float]))
+ union3 = list[range] | Alias1
+ self.assertIsInstance(union3, types.UnionType)
+ self.assertEqual(get_args(union3), (list[range], Alias1))
diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py
new file mode 100644
index 0000000..4ae9841
--- /dev/null
+++ b/Lib/test/test_type_params.py
@@ -0,0 +1,847 @@
+import asyncio
+import textwrap
+import types
+import unittest
+from test.support import requires_working_socket, check_syntax_error, run_code
+
+from typing import Generic, Sequence, TypeVar, TypeVarTuple, ParamSpec, get_args
+
+
+class TypeParamsInvalidTest(unittest.TestCase):
+ def test_name_collision_01(self):
+ check_syntax_error(self, """def func[**A, A](): ...""")
+
+ def test_name_non_collision_02(self):
+ ns = run_code("""def func[A](A): return A""")
+ func = ns["func"]
+ self.assertEqual(func(1), 1)
+ A, = func.__type_params__
+ self.assertEqual(A.__name__, "A")
+
+ def test_name_non_collision_03(self):
+ ns = run_code("""def func[A](*A): return A""")
+ func = ns["func"]
+ self.assertEqual(func(1), (1,))
+ A, = func.__type_params__
+ self.assertEqual(A.__name__, "A")
+
+ def test_name_non_collision_04(self):
+ # Mangled names should not cause a conflict.
+ ns = run_code("""
+ class ClassA:
+ def func[__A](self, __A): return __A
+ """
+ )
+ cls = ns["ClassA"]
+ self.assertEqual(cls().func(1), 1)
+ A, = cls.func.__type_params__
+ self.assertEqual(A.__name__, "__A")
+
+ def test_name_non_collision_05(self):
+ ns = run_code("""
+ class ClassA:
+ def func[_ClassA__A](self, __A): return __A
+ """
+ )
+ cls = ns["ClassA"]
+ self.assertEqual(cls().func(1), 1)
+ A, = cls.func.__type_params__
+ self.assertEqual(A.__name__, "_ClassA__A")
+
+ def test_name_non_collision_06(self):
+ ns = run_code("""
+ class ClassA[X]:
+ def func(self, X): return X
+ """
+ )
+ cls = ns["ClassA"]
+ self.assertEqual(cls().func(1), 1)
+ X, = cls.__type_params__
+ self.assertEqual(X.__name__, "X")
+
+ def test_name_non_collision_07(self):
+ ns = run_code("""
+ class ClassA[X]:
+ def func(self):
+ X = 1
+ return X
+ """
+ )
+ cls = ns["ClassA"]
+ self.assertEqual(cls().func(), 1)
+ X, = cls.__type_params__
+ self.assertEqual(X.__name__, "X")
+
+ def test_name_non_collision_08(self):
+ ns = run_code("""
+ class ClassA[X]:
+ def func(self):
+ return [X for X in [1, 2]]
+ """
+ )
+ cls = ns["ClassA"]
+ self.assertEqual(cls().func(), [1, 2])
+ X, = cls.__type_params__
+ self.assertEqual(X.__name__, "X")
+
+ def test_name_non_collision_9(self):
+ ns = run_code("""
+ class ClassA[X]:
+ def func[X](self):
+ ...
+ """
+ )
+ cls = ns["ClassA"]
+ outer_X, = cls.__type_params__
+ inner_X, = cls.func.__type_params__
+ self.assertEqual(outer_X.__name__, "X")
+ self.assertEqual(inner_X.__name__, "X")
+ self.assertIsNot(outer_X, inner_X)
+
+ def test_name_non_collision_10(self):
+ ns = run_code("""
+ class ClassA[X]:
+ X: int
+ """
+ )
+ cls = ns["ClassA"]
+ X, = cls.__type_params__
+ self.assertEqual(X.__name__, "X")
+ self.assertIs(cls.__annotations__["X"], int)
+
+ def test_name_non_collision_13(self):
+ ns = run_code("""
+ X = 1
+ def outer():
+ def inner[X]():
+ global X
+ X = 2
+ return inner
+ """
+ )
+ self.assertEqual(ns["X"], 1)
+ outer = ns["outer"]
+ outer()()
+ self.assertEqual(ns["X"], 2)
+
+ def test_disallowed_expressions(self):
+ check_syntax_error(self, "type X = (yield)")
+ check_syntax_error(self, "type X = (yield from x)")
+ check_syntax_error(self, "type X = (await 42)")
+ check_syntax_error(self, "async def f(): type X = (yield)")
+ check_syntax_error(self, "type X = (y := 3)")
+ check_syntax_error(self, "class X[T: (yield)]: pass")
+ check_syntax_error(self, "class X[T: (yield from x)]: pass")
+ check_syntax_error(self, "class X[T: (await 42)]: pass")
+ check_syntax_error(self, "class X[T: (y := 3)]: pass")
+ check_syntax_error(self, "class X[T](y := Sequence[T]): pass")
+ check_syntax_error(self, "def f[T](y: (x := Sequence[T])): pass")
+
+
+class TypeParamsNonlocalTest(unittest.TestCase):
+ def test_nonlocal_disallowed_01(self):
+ code = """
+ def outer():
+ X = 1
+ def inner[X]():
+ nonlocal X
+ return X
+ """
+ check_syntax_error(self, code)
+
+ def test_nonlocal_disallowed_02(self):
+ code = """
+ def outer2[T]():
+ def inner1():
+ nonlocal T
+ """
+ check_syntax_error(self, textwrap.dedent(code))
+
+ def test_nonlocal_disallowed_03(self):
+ code = """
+ class Cls[T]:
+ nonlocal T
+ """
+ check_syntax_error(self, textwrap.dedent(code))
+
+ def test_nonlocal_allowed(self):
+ code = """
+ def func[T]():
+ T = "func"
+ def inner():
+ nonlocal T
+ T = "inner"
+ inner()
+ assert T == "inner"
+ """
+ ns = run_code(code)
+ func = ns["func"]
+ T, = func.__type_params__
+ self.assertEqual(T.__name__, "T")
+
+
+class TypeParamsAccessTest(unittest.TestCase):
+ def test_class_access_01(self):
+ ns = run_code("""
+ class ClassA[A, B](dict[A, B]):
+ ...
+ """
+ )
+ cls = ns["ClassA"]
+ A, B = cls.__type_params__
+ self.assertEqual(types.get_original_bases(cls), (dict[A, B], Generic[A, B]))
+
+ def test_class_access_02(self):
+ ns = run_code("""
+ class MyMeta[A, B](type): ...
+ class ClassA[A, B](metaclass=MyMeta[A, B]):
+ ...
+ """
+ )
+ meta = ns["MyMeta"]
+ cls = ns["ClassA"]
+ A1, B1 = meta.__type_params__
+ A2, B2 = cls.__type_params__
+ self.assertIsNot(A1, A2)
+ self.assertIsNot(B1, B2)
+ self.assertIs(type(cls), meta)
+
+ def test_class_access_03(self):
+ code = """
+ def my_decorator(a):
+ ...
+ @my_decorator(A)
+ class ClassA[A, B]():
+ ...
+ """
+
+ with self.assertRaisesRegex(NameError, "name 'A' is not defined"):
+ run_code(code)
+
+ def test_function_access_01(self):
+ ns = run_code("""
+ def func[A, B](a: dict[A, B]):
+ ...
+ """
+ )
+ func = ns["func"]
+ A, B = func.__type_params__
+ self.assertEqual(func.__annotations__["a"], dict[A, B])
+
+ def test_function_access_02(self):
+ code = """
+ def func[A](a = list[A]()):
+ ...
+ """
+
+ with self.assertRaisesRegex(NameError, "name 'A' is not defined"):
+ run_code(code)
+
+ def test_function_access_03(self):
+ code = """
+ def my_decorator(a):
+ ...
+ @my_decorator(A)
+ def func[A]():
+ ...
+ """
+
+ with self.assertRaisesRegex(NameError, "name 'A' is not defined"):
+ run_code(code)
+
+ def test_method_access_01(self):
+ ns = run_code("""
+ class ClassA:
+ x = int
+ def func[T](self, a: x, b: T):
+ ...
+ """
+ )
+ cls = ns["ClassA"]
+ self.assertIs(cls.func.__annotations__["a"], int)
+ T, = cls.func.__type_params__
+ self.assertIs(cls.func.__annotations__["b"], T)
+
+ def test_nested_access_01(self):
+ ns = run_code("""
+ class ClassA[A]:
+ def funcB[B](self):
+ class ClassC[C]:
+ def funcD[D](self):
+ return lambda: (A, B, C, D)
+ return ClassC
+ """
+ )
+ cls = ns["ClassA"]
+ A, = cls.__type_params__
+ B, = cls.funcB.__type_params__
+ classC = cls().funcB()
+ C, = classC.__type_params__
+ D, = classC.funcD.__type_params__
+ self.assertEqual(classC().funcD()(), (A, B, C, D))
+
+ def test_out_of_scope_01(self):
+ code = """
+ class ClassA[T]: ...
+ x = T
+ """
+
+ with self.assertRaisesRegex(NameError, "name 'T' is not defined"):
+ run_code(code)
+
+ def test_out_of_scope_02(self):
+ code = """
+ class ClassA[A]:
+ def funcB[B](self): ...
+
+ x = B
+ """
+
+ with self.assertRaisesRegex(NameError, "name 'B' is not defined"):
+ run_code(code)
+
+ def test_class_scope_interaction_01(self):
+ ns = run_code("""
+ class C:
+ x = 1
+ def method[T](self, arg: x): pass
+ """)
+ cls = ns["C"]
+ self.assertEqual(cls.method.__annotations__["arg"], 1)
+
+ def test_class_scope_interaction_02(self):
+ ns = run_code("""
+ class C:
+ class Base: pass
+ class Child[T](Base): pass
+ """)
+ cls = ns["C"]
+ self.assertEqual(cls.Child.__bases__, (cls.Base, Generic))
+ T, = cls.Child.__type_params__
+ self.assertEqual(types.get_original_bases(cls.Child), (cls.Base, Generic[T]))
+
+ def test_class_deref(self):
+ ns = run_code("""
+ class C[T]:
+ T = "class"
+ type Alias = T
+ """)
+ cls = ns["C"]
+ self.assertEqual(cls.Alias.__value__, "class")
+
+ def test_shadowing_nonlocal(self):
+ ns = run_code("""
+ def outer[T]():
+ T = "outer"
+ def inner():
+ nonlocal T
+ T = "inner"
+ return T
+ return lambda: T, inner
+ """)
+ outer = ns["outer"]
+ T, = outer.__type_params__
+ self.assertEqual(T.__name__, "T")
+ getter, inner = outer()
+ self.assertEqual(getter(), "outer")
+ self.assertEqual(inner(), "inner")
+ self.assertEqual(getter(), "inner")
+
+ def test_reference_previous_typevar(self):
+ def func[S, T: Sequence[S]]():
+ pass
+
+ S, T = func.__type_params__
+ self.assertEqual(T.__bound__, Sequence[S])
+
+ def test_super(self):
+ class Base:
+ def meth(self):
+ return "base"
+
+ class Child(Base):
+ # Having int in the annotation ensures the class gets cells for both
+ # __class__ and __classdict__
+ def meth[T](self, arg: int) -> T:
+ return super().meth() + "child"
+
+ c = Child()
+ self.assertEqual(c.meth(1), "basechild")
+
+ def test_type_alias_containing_lambda(self):
+ type Alias[T] = lambda: T
+ T, = Alias.__type_params__
+ self.assertIs(Alias.__value__(), T)
+
+ def test_class_base_containing_lambda(self):
+ # Test that scopes nested inside hidden functions work correctly
+ outer_var = "outer"
+ class Base[T]: ...
+ class Child[T](Base[lambda: (int, outer_var, T)]): ...
+ base, _ = types.get_original_bases(Child)
+ func, = get_args(base)
+ T, = Child.__type_params__
+ self.assertEqual(func(), (int, "outer", T))
+
+ def test_comprehension_01(self):
+ type Alias[T: ([T for T in (T, [1])[1]], T)] = [T for T in T.__name__]
+ self.assertEqual(Alias.__value__, ["T"])
+ T, = Alias.__type_params__
+ self.assertEqual(T.__constraints__, ([1], T))
+
+ def test_comprehension_02(self):
+ type Alias[T: [lambda: T for T in (T, [1])[1]]] = [lambda: T for T in T.__name__]
+ func, = Alias.__value__
+ self.assertEqual(func(), "T")
+ T, = Alias.__type_params__
+ func, = T.__bound__
+ self.assertEqual(func(), 1)
+
+
+def global_generic_func[T]():
+ pass
+
+class GlobalGenericClass[T]:
+ pass
+
+
+class TypeParamsLazyEvaluationTest(unittest.TestCase):
+ def test_qualname(self):
+ class Foo[T]:
+ pass
+
+ def func[T]():
+ pass
+
+ self.assertEqual(Foo.__qualname__, "TypeParamsLazyEvaluationTest.test_qualname.<locals>.Foo")
+ self.assertEqual(func.__qualname__, "TypeParamsLazyEvaluationTest.test_qualname.<locals>.func")
+ self.assertEqual(global_generic_func.__qualname__, "global_generic_func")
+ self.assertEqual(GlobalGenericClass.__qualname__, "GlobalGenericClass")
+
+ def test_recursive_class(self):
+ class Foo[T: Foo, U: (Foo, Foo)]:
+ pass
+
+ type_params = Foo.__type_params__
+ self.assertEqual(len(type_params), 2)
+ self.assertEqual(type_params[0].__name__, "T")
+ self.assertEqual(type_params[0].__bound__, Foo)
+ self.assertEqual(type_params[0].__constraints__, None)
+
+ self.assertEqual(type_params[1].__name__, "U")
+ self.assertEqual(type_params[1].__bound__, None)
+ self.assertEqual(type_params[1].__constraints__, (Foo, Foo))
+
+ def test_evaluation_error(self):
+ class Foo[T: Undefined, U: (Undefined,)]:
+ pass
+
+ type_params = Foo.__type_params__
+ with self.assertRaises(NameError):
+ type_params[0].__bound__
+ self.assertEqual(type_params[0].__constraints__, None)
+ self.assertEqual(type_params[1].__bound__, None)
+ with self.assertRaises(NameError):
+ type_params[1].__constraints__
+
+ Undefined = "defined"
+ self.assertEqual(type_params[0].__bound__, "defined")
+ self.assertEqual(type_params[0].__constraints__, None)
+
+ self.assertEqual(type_params[1].__bound__, None)
+ self.assertEqual(type_params[1].__constraints__, ("defined",))
+
+
+class TypeParamsClassScopeTest(unittest.TestCase):
+ def test_alias(self):
+ class X:
+ T = int
+ type U = T
+ self.assertIs(X.U.__value__, int)
+
+ ns = run_code("""
+ glb = "global"
+ class X:
+ cls = "class"
+ type U = (glb, cls)
+ """)
+ cls = ns["X"]
+ self.assertEqual(cls.U.__value__, ("global", "class"))
+
+ def test_bound(self):
+ class X:
+ T = int
+ def foo[U: T](self): ...
+ self.assertIs(X.foo.__type_params__[0].__bound__, int)
+
+ ns = run_code("""
+ glb = "global"
+ class X:
+ cls = "class"
+ def foo[T: glb, U: cls](self): ...
+ """)
+ cls = ns["X"]
+ T, U = cls.foo.__type_params__
+ self.assertEqual(T.__bound__, "global")
+ self.assertEqual(U.__bound__, "class")
+
+ def test_modified_later(self):
+ class X:
+ T = int
+ def foo[U: T](self): ...
+ type Alias = T
+ X.T = float
+ self.assertIs(X.foo.__type_params__[0].__bound__, float)
+ self.assertIs(X.Alias.__value__, float)
+
+ def test_binding_uses_global(self):
+ ns = run_code("""
+ x = "global"
+ def outer():
+ x = "nonlocal"
+ class Cls:
+ type Alias = x
+ val = Alias.__value__
+ def meth[T: x](self, arg: x): ...
+ bound = meth.__type_params__[0].__bound__
+ annotation = meth.__annotations__["arg"]
+ x = "class"
+ return Cls
+ """)
+ cls = ns["outer"]()
+ self.assertEqual(cls.val, "global")
+ self.assertEqual(cls.bound, "global")
+ self.assertEqual(cls.annotation, "global")
+
+ def test_no_binding_uses_nonlocal(self):
+ ns = run_code("""
+ x = "global"
+ def outer():
+ x = "nonlocal"
+ class Cls:
+ type Alias = x
+ val = Alias.__value__
+ def meth[T: x](self, arg: x): ...
+ bound = meth.__type_params__[0].__bound__
+ return Cls
+ """)
+ cls = ns["outer"]()
+ self.assertEqual(cls.val, "nonlocal")
+ self.assertEqual(cls.bound, "nonlocal")
+ self.assertEqual(cls.meth.__annotations__["arg"], "nonlocal")
+
+ def test_explicit_global(self):
+ ns = run_code("""
+ x = "global"
+ def outer():
+ x = "nonlocal"
+ class Cls:
+ global x
+ type Alias = x
+ Cls.x = "class"
+ return Cls
+ """)
+ cls = ns["outer"]()
+ self.assertEqual(cls.Alias.__value__, "global")
+
+ def test_explicit_global_with_no_static_bound(self):
+ ns = run_code("""
+ def outer():
+ class Cls:
+ global x
+ type Alias = x
+ Cls.x = "class"
+ return Cls
+ """)
+ ns["x"] = "global"
+ cls = ns["outer"]()
+ self.assertEqual(cls.Alias.__value__, "global")
+
+ def test_explicit_global_with_assignment(self):
+ ns = run_code("""
+ x = "global"
+ def outer():
+ x = "nonlocal"
+ class Cls:
+ global x
+ type Alias = x
+ x = "global from class"
+ Cls.x = "class"
+ return Cls
+ """)
+ cls = ns["outer"]()
+ self.assertEqual(cls.Alias.__value__, "global from class")
+
+ def test_explicit_nonlocal(self):
+ ns = run_code("""
+ x = "global"
+ def outer():
+ x = "nonlocal"
+ class Cls:
+ nonlocal x
+ type Alias = x
+ x = "class"
+ return Cls
+ """)
+ cls = ns["outer"]()
+ self.assertEqual(cls.Alias.__value__, "class")
+
+
+class TypeParamsManglingTest(unittest.TestCase):
+ def test_mangling(self):
+ class Foo[__T]:
+ param = __T
+ def meth[__U](self, arg: __T, arg2: __U):
+ return (__T, __U)
+ type Alias[__V] = (__T, __V)
+
+ T = Foo.__type_params__[0]
+ self.assertEqual(T.__name__, "__T")
+ U = Foo.meth.__type_params__[0]
+ self.assertEqual(U.__name__, "__U")
+ V = Foo.Alias.__type_params__[0]
+ self.assertEqual(V.__name__, "__V")
+
+ anno = Foo.meth.__annotations__
+ self.assertIs(anno["arg"], T)
+ self.assertIs(anno["arg2"], U)
+ self.assertEqual(Foo().meth(1, 2), (T, U))
+
+ self.assertEqual(Foo.Alias.__value__, (T, V))
+
+
+class TypeParamsComplexCallsTest(unittest.TestCase):
+ def test_defaults(self):
+ # Generic functions with both defaults and kwdefaults trigger a specific code path
+ # in the compiler.
+ def func[T](a: T = "a", *, b: T = "b"):
+ return (a, b)
+
+ T, = func.__type_params__
+ self.assertIs(func.__annotations__["a"], T)
+ self.assertIs(func.__annotations__["b"], T)
+ self.assertEqual(func(), ("a", "b"))
+ self.assertEqual(func(1), (1, "b"))
+ self.assertEqual(func(b=2), ("a", 2))
+
+ def test_complex_base(self):
+ class Base:
+ def __init_subclass__(cls, **kwargs) -> None:
+ cls.kwargs = kwargs
+
+ kwargs = {"c": 3}
+ # Base classes with **kwargs trigger a different code path in the compiler.
+ class C[T](Base, a=1, b=2, **kwargs):
+ pass
+
+ T, = C.__type_params__
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(C.kwargs, {"a": 1, "b": 2, "c": 3})
+
+ bases = (Base,)
+ class C2[T](*bases, **kwargs):
+ pass
+
+ T, = C2.__type_params__
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(C2.kwargs, {"c": 3})
+
+
+class TypeParamsTraditionalTypeVarsTest(unittest.TestCase):
+ def test_traditional_01(self):
+ code = """
+ from typing import Generic
+ class ClassA[T](Generic[T]): ...
+ """
+
+ with self.assertRaisesRegex(TypeError, r"Cannot inherit from Generic\[...\] multiple times."):
+ run_code(code)
+
+ def test_traditional_02(self):
+ from typing import TypeVar
+ S = TypeVar("S")
+ with self.assertRaises(TypeError):
+ class ClassA[T](dict[T, S]): ...
+
+ def test_traditional_03(self):
+ # This does not generate a runtime error, but it should be
+ # flagged as an error by type checkers.
+ from typing import TypeVar
+ S = TypeVar("S")
+ def func[T](a: T, b: S) -> T | S:
+ return a
+
+
+class TypeParamsTypeVarTest(unittest.TestCase):
+ def test_typevar_01(self):
+ def func1[A: str, B: str | int, C: (int, str)]():
+ return (A, B, C)
+
+ a, b, c = func1()
+
+ self.assertIsInstance(a, TypeVar)
+ self.assertEqual(a.__bound__, str)
+ self.assertTrue(a.__infer_variance__)
+ self.assertFalse(a.__covariant__)
+ self.assertFalse(a.__contravariant__)
+
+ self.assertIsInstance(b, TypeVar)
+ self.assertEqual(b.__bound__, str | int)
+ self.assertTrue(b.__infer_variance__)
+ self.assertFalse(b.__covariant__)
+ self.assertFalse(b.__contravariant__)
+
+ self.assertIsInstance(c, TypeVar)
+ self.assertEqual(c.__bound__, None)
+ self.assertEqual(c.__constraints__, (int, str))
+ self.assertTrue(c.__infer_variance__)
+ self.assertFalse(c.__covariant__)
+ self.assertFalse(c.__contravariant__)
+
+ def test_typevar_generator(self):
+ def get_generator[A]():
+ def generator1[C]():
+ yield C
+
+ def generator2[B]():
+ yield A
+ yield B
+ yield from generator1()
+ return generator2
+
+ gen = get_generator()
+
+ a, b, c = [x for x in gen()]
+
+ self.assertIsInstance(a, TypeVar)
+ self.assertEqual(a.__name__, "A")
+ self.assertIsInstance(b, TypeVar)
+ self.assertEqual(b.__name__, "B")
+ self.assertIsInstance(c, TypeVar)
+ self.assertEqual(c.__name__, "C")
+
+ @requires_working_socket()
+ def test_typevar_coroutine(self):
+ def get_coroutine[A]():
+ async def coroutine[B]():
+ return (A, B)
+ return coroutine
+
+ co = get_coroutine()
+
+ self.addCleanup(asyncio.set_event_loop_policy, None)
+ a, b = asyncio.run(co())
+
+ self.assertIsInstance(a, TypeVar)
+ self.assertEqual(a.__name__, "A")
+ self.assertIsInstance(b, TypeVar)
+ self.assertEqual(b.__name__, "B")
+
+
+class TypeParamsTypeVarTupleTest(unittest.TestCase):
+ def test_typevartuple_01(self):
+ code = """def func1[*A: str](): pass"""
+ check_syntax_error(self, code)
+ code = """def func1[*A: (int, str)](): pass"""
+ check_syntax_error(self, code)
+ code = """class X[*A: str]: pass"""
+ check_syntax_error(self, code)
+ code = """class X[*A: (int, str)]: pass"""
+ check_syntax_error(self, code)
+ code = """type X[*A: str] = int"""
+ check_syntax_error(self, code)
+ code = """type X[*A: (int, str)] = int"""
+ check_syntax_error(self, code)
+
+ def test_typevartuple_02(self):
+ def func1[*A]():
+ return A
+
+ a = func1()
+ self.assertIsInstance(a, TypeVarTuple)
+
+
+class TypeParamsTypeVarParamSpecTest(unittest.TestCase):
+ def test_paramspec_01(self):
+ code = """def func1[**A: str](): pass"""
+ check_syntax_error(self, code)
+ code = """def func1[**A: (int, str)](): pass"""
+ check_syntax_error(self, code)
+ code = """class X[**A: str]: pass"""
+ check_syntax_error(self, code)
+ code = """class X[**A: (int, str)]: pass"""
+ check_syntax_error(self, code)
+ code = """type X[**A: str] = int"""
+ check_syntax_error(self, code)
+ code = """type X[**A: (int, str)] = int"""
+ check_syntax_error(self, code)
+
+ def test_paramspec_02(self):
+ def func1[**A]():
+ return A
+
+ a = func1()
+ self.assertIsInstance(a, ParamSpec)
+ self.assertTrue(a.__infer_variance__)
+ self.assertFalse(a.__covariant__)
+ self.assertFalse(a.__contravariant__)
+
+
+class TypeParamsTypeParamsDunder(unittest.TestCase):
+ def test_typeparams_dunder_class_01(self):
+ class Outer[A, B]:
+ class Inner[C, D]:
+ @staticmethod
+ def get_typeparams():
+ return A, B, C, D
+
+ a, b, c, d = Outer.Inner.get_typeparams()
+ self.assertEqual(Outer.__type_params__, (a, b))
+ self.assertEqual(Outer.Inner.__type_params__, (c, d))
+
+ self.assertEqual(Outer.__parameters__, (a, b))
+ self.assertEqual(Outer.Inner.__parameters__, (c, d))
+
+ def test_typeparams_dunder_class_02(self):
+ class ClassA:
+ pass
+
+ self.assertEqual(ClassA.__type_params__, ())
+
+ def test_typeparams_dunder_class_03(self):
+ code = """
+ class ClassA[A]():
+ pass
+ ClassA.__type_params__ = ()
+ """
+
+ with self.assertRaisesRegex(AttributeError, "attribute '__type_params__' of 'type' objects is not writable"):
+ run_code(code)
+
+ def test_typeparams_dunder_function_01(self):
+ def outer[A, B]():
+ def inner[C, D]():
+ return A, B, C, D
+
+ return inner
+
+ inner = outer()
+ a, b, c, d = inner()
+ self.assertEqual(outer.__type_params__, (a, b))
+ self.assertEqual(inner.__type_params__, (c, d))
+
+ def test_typeparams_dunder_function_02(self):
+ def func1():
+ pass
+
+ self.assertEqual(func1.__type_params__, ())
+
+ def test_typeparams_dunder_function_03(self):
+ code = """
+ def func[A]():
+ pass
+ func.__type_params__ = ()
+ """
+
+ with self.assertRaisesRegex(AttributeError, "attribute '__type_params__' of 'function' objects is not writable"):
+ run_code(code)
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index e1c6a8a7f3..71aff87dca 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -48,11 +48,8 @@
from test import _typed_dict_helper
-py_typing = import_helper.import_fresh_module('typing', blocked=['_typing'])
-c_typing = import_helper.import_fresh_module('typing', fresh=['_typing'])
-
-
CANNOT_SUBCLASS_TYPE = 'Cannot subclass special typing classes'
+NOT_A_BASE_TYPE = "type 'typing.%s' is not an acceptable base type"
CANNOT_SUBCLASS_INSTANCE = 'Cannot subclass an instance of %s'
@@ -430,7 +427,7 @@ def test_no_redefinition(self):
self.assertNotEqual(TypeVar('T', int, str), TypeVar('T', int, str))
def test_cannot_subclass(self):
- with self.assertRaisesRegex(TypeError, CANNOT_SUBCLASS_TYPE):
+ with self.assertRaisesRegex(TypeError, NOT_A_BASE_TYPE % 'TypeVar'):
class V(TypeVar): pass
T = TypeVar("T")
with self.assertRaisesRegex(TypeError,
@@ -446,6 +443,9 @@ def test_bound_errors(self):
TypeVar('X', bound=Union)
with self.assertRaises(TypeError):
TypeVar('X', str, float, bound=Employee)
+ with self.assertRaisesRegex(TypeError,
+ r"Bound must be a type\. Got \(1, 2\)\."):
+ TypeVar('X', bound=(1, 2))
def test_missing__name__(self):
# See bpo-39942
@@ -1161,7 +1161,7 @@ class A(Generic[Unpack[Ts]]): pass
self.assertEndsWith(repr(K[float, str]), 'A[float, str, typing.Unpack[typing.Tuple[str, ...]]]')
def test_cannot_subclass(self):
- with self.assertRaisesRegex(TypeError, CANNOT_SUBCLASS_TYPE):
+ with self.assertRaisesRegex(TypeError, NOT_A_BASE_TYPE % 'TypeVarTuple'):
class C(TypeVarTuple): pass
Ts = TypeVarTuple('Ts')
with self.assertRaisesRegex(TypeError,
@@ -6444,34 +6444,27 @@ def foo(a: A) -> Optional[BaseException]:
class TestModules(TestCase):
func_names = ['_idfunc']
- def test_py_functions(self):
- for fname in self.func_names:
- self.assertEqual(getattr(py_typing, fname).__module__, 'typing')
-
- @skipUnless(c_typing, 'requires _typing')
def test_c_functions(self):
for fname in self.func_names:
- self.assertEqual(getattr(c_typing, fname).__module__, '_typing')
+ self.assertEqual(getattr(typing, fname).__module__, '_typing')
-class NewTypeTests:
+class NewTypeTests(BaseTestCase):
def cleanup(self):
- for f in self.module._cleanups:
+ for f in typing._cleanups:
f()
@classmethod
def setUpClass(cls):
- sys.modules['typing'] = cls.module
global UserId
- UserId = cls.module.NewType('UserId', int)
- cls.UserName = cls.module.NewType(cls.__qualname__ + '.UserName', str)
+ UserId = typing.NewType('UserId', int)
+ cls.UserName = typing.NewType(cls.__qualname__ + '.UserName', str)
@classmethod
def tearDownClass(cls):
global UserId
del UserId
del cls.UserName
- sys.modules['typing'] = typing
def tearDown(self):
self.cleanup()
@@ -6491,11 +6484,11 @@ class D(UserId):
def test_or(self):
for cls in (int, self.UserName):
with self.subTest(cls=cls):
- self.assertEqual(UserId | cls, self.module.Union[UserId, cls])
- self.assertEqual(cls | UserId, self.module.Union[cls, UserId])
+ self.assertEqual(UserId | cls, typing.Union[UserId, cls])
+ self.assertEqual(cls | UserId, typing.Union[cls, UserId])
- self.assertEqual(self.module.get_args(UserId | cls), (UserId, cls))
- self.assertEqual(self.module.get_args(cls | UserId), (cls, UserId))
+ self.assertEqual(typing.get_args(UserId | cls), (UserId, cls))
+ self.assertEqual(typing.get_args(cls | UserId), (cls, UserId))
def test_special_attrs(self):
self.assertEqual(UserId.__name__, 'UserId')
@@ -6516,7 +6509,7 @@ def test_repr(self):
f'{__name__}.{self.__class__.__qualname__}.UserName')
def test_pickle(self):
- UserAge = self.module.NewType('UserAge', float)
+ UserAge = typing.NewType('UserAge', float)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(proto=proto):
pickled = pickle.dumps(UserId, proto)
@@ -6548,15 +6541,6 @@ class ProUserId(UserId):
...
-class NewTypePythonTests(NewTypeTests, BaseTestCase):
- module = py_typing
-
-
-@skipUnless(c_typing, 'requires _typing')
-class NewTypeCTests(NewTypeTests, BaseTestCase):
- module = c_typing
-
-
class NamedTupleTests(BaseTestCase):
class NestedEmployee(NamedTuple):
name: str
@@ -8170,11 +8154,11 @@ def test_paramspec_gets_copied(self):
self.assertEqual(C2[Concatenate[T, P2]].__parameters__, (T, P2))
def test_cannot_subclass(self):
- with self.assertRaisesRegex(TypeError, CANNOT_SUBCLASS_TYPE):
+ with self.assertRaisesRegex(TypeError, NOT_A_BASE_TYPE % 'ParamSpec'):
class C(ParamSpec): pass
- with self.assertRaisesRegex(TypeError, CANNOT_SUBCLASS_TYPE):
+ with self.assertRaisesRegex(TypeError, NOT_A_BASE_TYPE % 'ParamSpecArgs'):
class C(ParamSpecArgs): pass
- with self.assertRaisesRegex(TypeError, CANNOT_SUBCLASS_TYPE):
+ with self.assertRaisesRegex(TypeError, NOT_A_BASE_TYPE % 'ParamSpecKwargs'):
class C(ParamSpecKwargs): pass
P = ParamSpec('P')
with self.assertRaisesRegex(TypeError,
|