Removed remaining code that was left over from PEP 637, which was rejected.

Author: erictraut

packages/pyright-internal/src/analyzer/typeEvaluator.ts

@@ -8119,13 +8119,9 @@ export function createTypeEvaluator(
             }
         }
 
-        // Follow PEP 637 rules for positional and keyword arguments.
-        const positionalArgs = node.d.items.filter((item) => item.d.argCategory === ArgCategory.Simple && !item.d.name);
+        const positionalArgs = node.d.items.filter((item) => item.d.argCategory === ArgCategory.Simple);
         const unpackedListArgs = node.d.items.filter((item) => item.d.argCategory === ArgCategory.UnpackedList);
 
-        const keywordArgs = node.d.items.filter((item) => item.d.argCategory === ArgCategory.Simple && !!item.d.name);
-        const unpackedDictArgs = node.d.items.filter((item) => item.d.argCategory === ArgCategory.UnpackedDictionary);
-
         let positionalIndexType: Type;
         let isPositionalIndexTypeIncomplete = false;
 
@@ -8136,9 +8132,6 @@ export function createTypeEvaluator(
             if (typeResult.isIncomplete) {
                 isPositionalIndexTypeIncomplete = true;
             }
-        } else if (positionalArgs.length === 0 && unpackedListArgs.length === 0) {
-            // Handle the case where there are no positionals provided but there are keywords.
-            positionalIndexType = makeTupleObject(evaluatorInterface, []);
         } else {
             // Package up all of the positionals into a tuple.
             const tupleTypeArgs: TupleTypeArg[] = [];
@@ -8192,23 +8185,6 @@ export function createTypeEvaluator(
             });
         }
 
-        keywordArgs.forEach((arg) => {
-            argList.push({
-                argCategory: ArgCategory.Simple,
-                valueExpression: arg.d.valueExpr,
-                node: arg,
-                name: arg.d.name,
-            });
-        });
-
-        unpackedDictArgs.forEach((arg) => {
-            argList.push({
-                argCategory: ArgCategory.UnpackedDictionary,
-                valueExpression: arg.d.valueExpr,
-                node: arg,
-            });
-        });
-
         const callResult = validateCallArgs(
             node,
             argList,

packages/pyright-internal/src/tests/samples/subscript3.py

@@ -1,141 +1,10 @@
-# This sample tests subscript forms specified in PEP 637 -
-# keyword and unpacked args.
+# This sample tests the handling of a subscript in a loop that includes
+# a del statement.
 
-from typing import Any, Union, overload
+# pyright: strict
 
 
-class ClassA:
-    @overload
-    def __getitem__(self, index: int) -> int:
-        ...
-
-    @overload
-    def __getitem__(self, index: tuple[int, ...]) -> float:
-        ...
-
-    @overload
-    def __getitem__(self, index: Any, *, v1: int) -> str:
-        ...
-
-    def __getitem__(self, index: Any, *, v1: int = 3) -> Union[str, float]:
-        ...
-
-    @overload
-    def __setitem__(self, index: int, value: int) -> None:
-        ...
-
-    @overload
-    def __setitem__(self, index: tuple[int, ...], value: float) -> None:
-        ...
-
-    @overload
-    def __setitem__(self, index: Any, value: str, *, v1: int) -> None:
-        ...
-
-    def __setitem__(self, index: Any, value: Union[str, float], *, v1: int = 3) -> None:
-        ...
-
-
-val_list = [1, 2, 3]
-val_dict = {"a": 2, "b": 2}
-
-a_obj = ClassA()
-
-x1 = a_obj[1]
-reveal_type(x1, expected_text="int")
-
-a_obj[1] = 3
-
-# This should generate an error because float isn't assignable.
-a_obj[1] = 3.5
-
-x2 = a_obj[1,]
-reveal_type(x2, expected_text="float")
-
-a_obj[1,] = 3.4
-
-# This should generate an error because complex isn't assignable.
-a_obj[1,] = 3.5j
-
-x3 = a_obj[1,2]
-reveal_type(x3, expected_text="float")
-
-a_obj[1,2] = 4.5
-
-# This should generate an error because complex isn't assignable.
-a_obj[1,2] = 3.5j
-
-x4 = a_obj[(1,)]
-reveal_type(x4, expected_text="float")
-
-a_obj[(1,)] = 3
-
-# This should generate an error because complex isn't assignable.
-a_obj[(1,)] = 3.5j
-
-x6 = a_obj[1, v1=3]
-reveal_type(x6, expected_text="str")
-
-a_obj[1, v1=3] = "hi"
-
-# This should generate an error because complex isn't assignable.
-a_obj[1,v1=3] = 3.5j
-
-
-x8 = a_obj[1, *val_list]
-reveal_type(x8, expected_text="float")
-
-a_obj[1, *val_list] = 4.3
-
-# This should generate an error because complex isn't assignable.
-a_obj[1, *val_list] = 4.3j
-
-
-
-class ClassB:
-    def __getitem__(self, value: tuple[()], *, v1: int) -> str:
-        ...
-
-b_obj = ClassB()
-
-# This should generate an error because positional args are not allowed.
-y1 = b_obj[1]
-
-y2 = b_obj[v1=3]
-reveal_type(y2, expected_text="str")
-
-# This should generate an error because v2 is not a named arg.
-y3 = b_obj[v2=3]
-
-
-class ClassC:
-    def __getitem__(self, index: Any, **kwargs: int) -> complex:
-        ...
-    
-    def __setitem__(self, index: Any, value: float, **kwargs: int) -> None:
-        ...
-    
-c_obj = ClassC()
-
-z1 = c_obj[1, *val_list]
-reveal_type(z1, expected_text="complex")
-
-# This should generate an error because dictionary unpack isn't allowed in subscript.
-z2 = c_obj[1, *val_list, **val_dict]
-
-c_obj[1, *val_list] = 4.3
-
-# This should generate an error because dictionary unpack isn't allowed in subscript.
-c_obj[1, *val_list, **val_dict] = 4.3
-
-# This should generate an error because complex isn't assignable.
-c_obj[1, *val_list] = 4.3j
-
-
-z2 = c_obj[1, v1=3, v2=4]
-reveal_type(z2, expected_text="complex")
-
-c_obj[1, v1=3, v2=4] = 4.3
-
-# This should generate an error because complex isn't assignable.
-c_obj[1, v1=3, v2=4] = 4.3j
+def func1(lst: list[tuple[int, int]]):
+    for _ in range(1):
+        lst[-1] = lst[-1][1], lst[-1][0]
+        del lst[-1]

packages/pyright-internal/src/tests/samples/subscript4.py

@@ -9,13 +9,7 @@
  */
 
 import { ConfigOptions } from '../common/configOptions';
-import {
-    pythonVersion3_10,
-    pythonVersion3_11,
-    pythonVersion3_12,
-    pythonVersion3_8,
-    pythonVersion3_9,
-} from '../common/pythonVersion';
+import { pythonVersion3_10, pythonVersion3_11, pythonVersion3_12, pythonVersion3_8 } from '../common/pythonVersion';
 import { Uri } from '../common/uri/uri';
 import * as TestUtils from './testUtils';
 
@@ -966,22 +960,7 @@ test('Subscript2', () => {
 });
 
 test('Subscript3', () => {
-    const configOptions = new ConfigOptions(Uri.empty());
-
-    // Analyze with Python 3.9 settings.
-    configOptions.defaultPythonVersion = pythonVersion3_9;
-    const analysisResults39 = TestUtils.typeAnalyzeSampleFiles(['subscript3.py'], configOptions);
-    TestUtils.validateResults(analysisResults39, 37);
-
-    // Analyze with Python 3.10 settings.
-    // These are disabled because PEP 637 was rejected.
-    // configOptions.defaultPythonVersion = pythonVersion3_10;
-    // const analysisResults310 = TestUtils.typeAnalyzeSampleFiles(['subscript3.py'], configOptions);
-    // TestUtils.validateResults(analysisResults310, 11);
-});
-
-test('Subscript4', () => {
-    const analysisResults = TestUtils.typeAnalyzeSampleFiles(['subscript4.py']);
+    const analysisResults = TestUtils.typeAnalyzeSampleFiles(['subscript3.py']);
     TestUtils.validateResults(analysisResults, 0);
 });