File size: 16,218 Bytes
a4edccc
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
diff --git a/Lib/test/test_pep696_aug.py b/Lib/test/test_pep696_aug.py
new file mode 100644
index 0000000000..0000000000
--- /dev/null
+++ b/Lib/test/test_pep696_aug.py
@@ -0,0 +1,373 @@
+import ast
+import importlib
+import pathlib
+import textwrap
+import typing
+import unittest
+
+
+CPYTHON_ROOT = pathlib.Path(__file__).resolve().parents[2]
+
+
+def run_source(source):
+    namespace = {}
+    exec(textwrap.dedent(source), namespace)
+    return namespace
+
+
+class TypeParameterDefaultsAugmentedTests(unittest.TestCase):
+    def test_grammar_source_routes_defaults_into_ast_constructors(self):
+        grammar = (CPYTHON_ROOT / "Grammar" / "python.gram").read_text()
+
+        self.assertIn(
+            "c=[type_param_default] { _PyAST_TypeVar(a->v.Name.id, b, c, EXTRA) }",
+            grammar,
+        )
+        self.assertIn(
+            "b=[type_param_starred_default] { _PyAST_TypeVarTuple(a->v.Name.id, b, EXTRA) }",
+            grammar,
+        )
+        self.assertIn(
+            "b=[type_param_default] { _PyAST_ParamSpec(a->v.Name.id, b, EXTRA) }",
+            grammar,
+        )
+        self.assertIn(
+            'CHECK_VERSION(expr_ty, 13, "Type parameter defaults are", e)',
+            grammar,
+        )
+        self.assertEqual(
+            grammar.count('CHECK_VERSION(expr_ty, 13, "Type parameter defaults are", e)'),
+            2,
+        )
+        self.assertNotIn(
+            'CHECK_VERSION(expr_ty, 12, "Type parameter defaults are", e)',
+            grammar,
+        )
+
+    def test_ast_nodes_preserve_all_type_parameter_defaults(self):
+        tree = ast.parse(
+            "class C[T = int, *Ts = *tuple[str, int], **P = [str, int]]:\n"
+            "    pass"
+        )
+        params = tree.body[0].type_params
+
+        self.assertIsInstance(params[0].default_value, ast.Name)
+        self.assertEqual(params[0].default_value.id, "int")
+        self.assertIsInstance(params[1].default_value, ast.Starred)
+        self.assertIsInstance(params[1].default_value.value, ast.Subscript)
+        self.assertIsInstance(params[2].default_value, ast.List)
+        self.assertEqual([elt.id for elt in params[2].default_value.elts], ["str", "int"])
+
+    def test_feature_version_and_unparse_keep_typevar_default_visible(self):
+        source = "class C[T = int]:\n    pass"
+        with self.assertRaises(SyntaxError):
+            ast.parse(source, feature_version=(3, 12))
+
+        tree = ast.parse(source)
+        self.assertIn("T = int", ast.unparse(tree))
+
+    def test_nodefault_reduce_repr_and_constructor_contract(self):
+        nodefault = typing.NoDefault
+        self.assertEqual(repr(nodefault), "typing.NoDefault")
+        self.assertEqual(nodefault.__reduce__(), "NoDefault")
+        self.assertIs(getattr(typing, nodefault.__reduce__()), nodefault)
+        self.assertIs(type(nodefault)(), nodefault)
+        with self.assertRaises(TypeError):
+            type(nodefault)(1)
+        with self.assertRaises(TypeError):
+            nodefault()
+
+    def test_default_accessors_report_direct_values_for_all_type_parameters(self):
+        no_default = typing.NoDefault
+
+        type_var = typing.TypeVar("T", default=int)
+        self.assertIs(type_var.__default__, int)
+        self.assertTrue(type_var.has_default())
+        self.assertIs(typing.TypeVar("PlainT").__default__, no_default)
+
+        param_spec = typing.ParamSpec("P", default=[str, int])
+        self.assertEqual(param_spec.__default__, [str, int])
+        self.assertTrue(param_spec.has_default())
+        self.assertIs(typing.ParamSpec("PlainP").__default__, no_default)
+
+        type_var_tuple = typing.TypeVarTuple(
+            "Ts", default=typing.Unpack[tuple[str, int]]
+        )
+        self.assertEqual(type_var_tuple.__default__, typing.Unpack[tuple[str, int]])
+        self.assertTrue(type_var_tuple.has_default())
+        self.assertIs(typing.TypeVarTuple("PlainTs").__default__, no_default)
+
+    def test_subscription_uses_typevar_defaults_and_rejects_bad_order(self):
+        required = typing.TypeVar("Required")
+        defaulted = typing.TypeVar("Defaulted", default=int)
+
+        class Pair(typing.Generic[required, defaulted]):
+            pass
+
+        self.assertEqual(Pair[str].__args__, (str, int))
+        self.assertEqual(Pair[str, bytes].__args__, (str, bytes))
+
+        with self.assertRaisesRegex(TypeError, "without a default follows"):
+            typing.Generic[defaulted, required]
+
+        variadic = typing.TypeVarTuple("Variadic")
+        with self.assertRaisesRegex(TypeError, "default.*TypeVarTuple"):
+            class Bad(typing.Generic[typing.Unpack[variadic], defaulted]):
+                pass
+
+    def test_paramspec_and_typevartuple_defaults_are_used_for_subscription(self):
+        required = typing.TypeVar("Required")
+        params = typing.ParamSpec("P", default=[str, int])
+
+        class CallbackBox(typing.Generic[required, params]):
+            pass
+
+        self.assertEqual(CallbackBox[float].__args__, (float, (str, int)))
+        self.assertEqual(CallbackBox[float, [bytes]].__args__, (float, (bytes,)))
+
+        type_var_tuple = typing.TypeVarTuple(
+            "Ts", default=typing.Unpack[tuple[str, int]]
+        )
+
+        class TupleBox(typing.Generic[required, typing.Unpack[type_var_tuple]]):
+            pass
+
+        self.assertEqual(TupleBox[float].__args__, (float, str, int))
+        self.assertEqual(TupleBox[float, bytes].__args__, (float, bytes))
+
+    def test_pep695_runtime_defaults_are_lazily_attached(self):
+        namespace = run_source(
+            """
+            class Holder[T = Later]:
+                pass
+            """
+        )
+        type_param = namespace["Holder"].__type_params__[0]
+        with self.assertRaises(NameError):
+            type_param.__default__
+
+        namespace["Later"] = str
+        self.assertIs(type_param.__default__, str)
+
+        namespace = run_source(
+            """
+            class Chain[StartT = int, StopT = StartT]:
+                pass
+            """
+        )
+        start_t, stop_t = namespace["Chain"].__type_params__
+        self.assertIs(start_t.__default__, int)
+        self.assertIs(stop_t.__default__, start_t)
+
+    def test_starred_typevartuple_default_from_pep695_syntax_is_attached(self):
+        namespace = run_source(
+            """
+            default = tuple[int, str]
+            class C[*Ts = *default]:
+                pass
+            """
+        )
+        (type_var_tuple,) = namespace["C"].__type_params__
+        self.assertEqual(type_var_tuple.__default__, next(iter(namespace["default"])))
+
+    def test_manual_ast_compile_accepts_type_parameter_defaults(self):
+        module = ast.Module(
+            body=[
+                ast.ClassDef(
+                    name="Manual",
+                    bases=[],
+                    keywords=[],
+                    body=[ast.Pass()],
+                    decorator_list=[],
+                    type_params=[
+                        ast.TypeVar(
+                            "T",
+                            bound=ast.Name("object", ast.Load()),
+                            default_value=ast.Name("int", ast.Load()),
+                        ),
+                        ast.ParamSpec(
+                            "P",
+                            default_value=ast.List(
+                                [ast.Name("str", ast.Load()), ast.Name("int", ast.Load())],
+                                ast.Load(),
+                            ),
+                        ),
+                        ast.TypeVarTuple(
+                            "Ts",
+                            default_value=ast.Tuple(
+                                [ast.Name("str", ast.Load()), ast.Name("bytes", ast.Load())],
+                                ast.Load(),
+                            ),
+                        ),
+                    ],
+                )
+            ],
+            type_ignores=[],
+        )
+        ast.fix_missing_locations(module)
+        namespace = {}
+        exec(compile(module, "<manual-ast>", "exec"), namespace)
+
+        type_var, param_spec, type_var_tuple = namespace["Manual"].__type_params__
+        self.assertIs(type_var.__bound__, object)
+        self.assertIs(type_var.__default__, int)
+        self.assertEqual(param_spec.__default__, [str, int])
+        self.assertEqual(type_var_tuple.__default__, (str, bytes))
+
+    def test_manual_ast_compile_accepts_missing_default_attributes(self):
+        type_var = ast.TypeVar("T")
+        type_var_tuple = ast.TypeVarTuple("Ts")
+        param_spec = ast.ParamSpec("P")
+
+        module = ast.Module(
+            body=[
+                ast.ClassDef(
+                    name="Plain",
+                    bases=[],
+                    keywords=[],
+                    body=[ast.Pass()],
+                    decorator_list=[],
+                    type_params=[type_var, type_var_tuple, param_spec],
+                )
+            ],
+            type_ignores=[],
+        )
+        ast.fix_missing_locations(module)
+        namespace = {}
+        exec(compile(module, "<missing-default-ast>", "exec"), namespace)
+
+        for type_param in namespace["Plain"].__type_params__:
+            self.assertIs(type_param.__default__, typing.NoDefault)
+
+    def test_pep695_defaults_on_functions_and_type_aliases(self):
+        namespace = run_source(
+            """
+            def identity[T = int](value: T) -> T:
+                return value
+
+            def callback[**P = [str, int]](*args: P.args, **kwargs: P.kwargs):
+                return args, kwargs
+
+            type Alias[T = int, *Ts = *tuple[str, bytes], **P = [float]] = tuple[T, *Ts]
+            """
+        )
+
+        identity_t = namespace["identity"].__type_params__[0]
+        callback_p = namespace["callback"].__type_params__[0]
+        alias_t, alias_ts, alias_p = namespace["Alias"].__type_params__
+        self.assertIs(identity_t.__default__, int)
+        self.assertEqual(callback_p.__default__, [str, int])
+        self.assertIs(alias_t.__default__, int)
+        self.assertEqual(alias_ts.__default__, next(iter(tuple[str, bytes])))
+        self.assertEqual(alias_p.__default__, [float])
+
+    def test_pep695_default_order_errors_cover_variadic_and_paramspec(self):
+        with self.assertRaisesRegex(SyntaxError, "non-default type parameter"):
+            run_source(
+                """
+                class BadTypeVarTuple[T = int, *Ts]:
+                    pass
+                """
+            )
+        with self.assertRaisesRegex(SyntaxError, "non-default type parameter"):
+            run_source(
+                """
+                class BadParamSpec[T = int, **P]:
+                    pass
+                """
+            )
+
+    def test_lazy_defaults_cover_paramspec_typevartuple_and_class_scope(self):
+        namespace = run_source(
+            """
+            class Outer:
+                Later = tuple[str, bytes]
+
+                class Inner[T = Later]:
+                    pass
+
+            class Callback[**P = LaterArgs]:
+                pass
+
+            class Spread[*Ts = *LaterTuple]:
+                pass
+            """
+        )
+
+        inner_t = namespace["Outer"].Inner.__type_params__[0]
+        self.assertEqual(inner_t.__default__, tuple[str, bytes])
+
+        callback_p = namespace["Callback"].__type_params__[0]
+        spread_ts = namespace["Spread"].__type_params__[0]
+        with self.assertRaises(NameError):
+            callback_p.__default__
+        with self.assertRaises(NameError):
+            spread_ts.__default__
+
+        namespace["LaterArgs"] = [int, str]
+        namespace["LaterTuple"] = tuple[int, str]
+        self.assertEqual(callback_p.__default__, [int, str])
+        self.assertEqual(spread_ts.__default__, next(iter(namespace["LaterTuple"])))
+
+    def test_typing_private_default_branches_are_exercised(self):
+        required = typing.TypeVar("Required")
+        defaulted = typing.TypeVar("Defaulted", default=int)
+
+        class Pair(typing.Generic[required, defaulted]):
+            pass
+
+        # Subscription fills the trailing default and exercises the generic
+        # specialization guard; supplying more arguments than parameters is
+        # rejected.
+        self.assertEqual(Pair[str].__args__, (str, int))
+        self.assertEqual(Pair[str, bytes].__args__, (str, bytes))
+        with self.assertRaises(TypeError):
+            Pair[str, int, bytes]
+
+        # A TypeVarTuple parameter absorbs the trailing arguments, exercising
+        # the argument-unpacking path shared with default substitution.
+        first = typing.TypeVar("First")
+        rest = typing.TypeVarTuple("Rest")
+
+        class Row(typing.Generic[first, typing.Unpack[rest]]):
+            pass
+
+        self.assertEqual(Row[int, str, bytes].__args__, (int, str, bytes))
+
+    def test_runtime_constructor_wrappers_cover_optional_keywords(self):
+        full_typevar = typing.TypeVar(
+            "FullTypeVar",
+            bound=object,
+            default=int,
+            covariant=False,
+            contravariant=False,
+            infer_variance=True,
+        )
+        self.assertIs(full_typevar.__bound__, object)
+        self.assertIs(full_typevar.__default__, int)
+        self.assertTrue(full_typevar.__infer_variance__)
+
+        full_paramspec = typing.ParamSpec(
+            "FullParamSpec",
+            bound=object,
+            default=[str, int],
+            covariant=False,
+            contravariant=False,
+            infer_variance=True,
+        )
+        self.assertIs(full_paramspec.__bound__, object)
+        self.assertEqual(full_paramspec.__default__, [str, int])
+        self.assertTrue(full_paramspec.__infer_variance__)
+
+        plain_tuple = typing.TypeVarTuple("PlainTuple")
+        default_tuple = typing.TypeVarTuple("DefaultTuple", default=(str, bytes))
+        self.assertIs(plain_tuple.__default__, typing.NoDefault)
+        self.assertEqual(default_tuple.__default__, (str, bytes))
+
+        nodefault = typing.NoDefault
+        self.assertEqual(repr(nodefault), "typing.NoDefault")
+        self.assertEqual(nodefault.__reduce__(), "NoDefault")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/Lib/test/test_pep696_stability_aug.py b/Lib/test/test_pep696_stability_aug.py
new file mode 100644
index 0000000000..0000000000
--- /dev/null
+++ b/Lib/test/test_pep696_stability_aug.py
@@ -0,0 +1,44 @@
+import string
+import sys
+import unittest
+
+
+class TypeParameterDefaultsStabilityAugmentedTests(unittest.TestCase):
+    def test_string_template_substitution_and_formatter_are_stable(self):
+        template = string.Template("$name scored ${points} points")
+        self.assertEqual(
+            template.substitute(name="Ada", points=42),
+            "Ada scored 42 points",
+        )
+        self.assertEqual("{name}:{value:04d}".format(name="id", value=7), "id:0007")
+
+    def test_numeric_literal_and_float_roundtrip_behaviour_is_stable(self):
+        self.assertEqual(int("1_000_000"), 1000000)
+        self.assertEqual(int("ff", 16), 255)
+        value = float.fromhex("0x1.8p+2")
+        self.assertEqual(value.hex(), "0x1.8000000000000p+2")
+
+    def test_regular_function_and_class_execution_are_stable(self):
+        class Accumulator:
+            def __init__(self, initial=0):
+                self.total = initial
+
+            def add(self, *values):
+                for value in values:
+                    self.total += value
+                return self.total
+
+        acc = Accumulator(10)
+        self.assertEqual(acc.add(1, 2, 3), 16)
+        self.assertEqual([x * x for x in range(4)], [0, 1, 4, 9])
+
+    def test_sys_frame_metadata_for_regular_calls_is_stable(self):
+        def inner():
+            frame = sys._getframe()
+            return frame.f_code.co_name, frame.f_globals["__name__"]
+
+        self.assertEqual(inner(), ("inner", __name__))
+
+
+if __name__ == "__main__":
+    unittest.main()