cinderx [B] [A] [A]

Reviewed By: jbower-fb

Differential Revision: D86987304

fbshipit-source-id: a6a5911b7edf457df0d5d60ca04cbaebb1241124

Author: generatedunixname89002005287564

cinderx/PythonLib/cinderx/compiler/strict/common.py

@@ -26,10 +26,11 @@
     Try,
 )
 from collections import deque
+from collections.abc import Callable, Mapping, MutableMapping
 from contextlib import nullcontext
 from dataclasses import dataclass
 from symtable import Class, SymbolTable
-from typing import Callable, Dict, final, Generic, Mapping, MutableMapping, TypeVar
+from typing import final, Generic, TypeVar
 
 from .runtime import freeze_type, mutable
 
@@ -65,7 +66,7 @@ def make_fixed_modules() -> Mapping[str, Mapping[str, object]]:
 TVar = TypeVar("TScope")
 TScopeData = TypeVar("TData", covariant=True)
 
-SymbolMap = Dict[AST, SymbolTable]
+SymbolMap = dict[AST, SymbolTable]
 
 
 @dataclass
@@ -106,15 +107,15 @@ def __init__(self, symbols: SymbolTable) -> None:
         self.symbol_stack: deque[SymbolTable] = deque([symbols])
         children = self.symbol_stack.popleft().get_children()
         self.symbol_stack.extendleft(
-            (x for x in reversed(children) if not is_annotation(x))
+            x for x in reversed(children) if not is_annotation(x)
         )
         self.mapping: SymbolMap = {}
 
     def _process_scope_node(self, node: AST) -> None:
         current_symbol = self.mapping[node] = self.symbol_stack.popleft()
         children = current_symbol.get_children()
         self.symbol_stack.extendleft(
-            (x for x in reversed(children) if not is_annotation(x))
+            x for x in reversed(children) if not is_annotation(x)
         )
 
     def visit_ClassDef(self, node: ClassDef) -> None:

cinderx/PythonLib/cinderx/compiler/unparse.py

@@ -4,7 +4,8 @@
 import ast
 import sys
 import warnings
-from typing import Any, Callable, Dict, List, Optional, Type
+from collections.abc import Callable
+from typing import Optional
 
 
 PR_TUPLE = 0
@@ -277,7 +278,7 @@ def _format_set(node: ast.Set, level: int) -> str:
     return "{" + ", ".join(to_expr(elt, PR_TEST) for elt in node.elts) + "}"
 
 
-def _format_comprehensions(nodes: List[ast.comprehension]) -> str:
+def _format_comprehensions(nodes: list[ast.comprehension]) -> str:
     return "".join(_format_comprehension(n) for n in nodes)
 
 
@@ -304,7 +305,7 @@ def _format_gen_exp(node: ast.GeneratorExp, level: int) -> str:
     return "(" + to_expr(node.elt) + _format_comprehensions(node.generators) + ")"
 
 
-def format_fstring_elt(res: List[str], elt: ast.expr, is_format_spec: bool) -> None:
+def format_fstring_elt(res: list[str], elt: ast.expr, is_format_spec: bool) -> None:
     if isinstance(elt, ast.Constant):
         res.append(elt.value)
     elif isinstance(elt, ast.JoinedStr):