NamedTuples

Author: hauntsaninja

mypy/fswatcher.py

@@ -4,9 +4,10 @@
 from typing import AbstractSet, Dict, Iterable, List, NamedTuple, Optional, Set, Tuple
 
 
-FileData = NamedTuple('FileData', [('st_mtime', float),
-                                   ('st_size', int),
-                                   ('hash', str)])
+class FileData(NamedTuple):
+    st_mtime: float
+    st_size: int
+    hash: str
 
 
 class FileSystemWatcher:

mypy/modulefinder.py

@@ -30,15 +30,11 @@
 
 
 # Paths to be searched in find_module().
-SearchPaths = NamedTuple(
-    'SearchPaths',
-    [
-        ('python_path', Tuple[str, ...]),  # where user code is found
-        ('mypy_path', Tuple[str, ...]),  # from $MYPYPATH or config variable
-        ('package_path', Tuple[str, ...]),  # from get_site_packages_dirs()
-        ('typeshed_path', Tuple[str, ...]),  # paths in typeshed
-    ]
-)
+class SearchPaths(NamedTuple):
+    python_path: Tuple[str, ...]  # where user code is found
+    mypy_path: Tuple[str, ...]  # from $MYPYPATH or config variable
+    package_path: Tuple[str, ...]  # from get_site_packages_dirs()
+    typeshed_path: Tuple[str, ...]  # paths in typeshed
 
 
 # Package dirs are a two-tuple of path to search and whether to verify the module

mypyc/ir/class_ir.py

@@ -69,11 +69,11 @@
 # The 'shadow_method', if present, contains the method that should be
 # placed in the class's shadow vtable (if it has one).
 
-VTableMethod = NamedTuple(
-    'VTableMethod', [('cls', 'ClassIR'),
-                     ('name', str),
-                     ('method', FuncIR),
-                     ('shadow_method', Optional[FuncIR])])
+class VTableMethod(NamedTuple):
+    cls: 'ClassIR'
+    name: str
+    method: FuncIR
+    shadow_method: Optional[FuncIR]
 
 
 VTableEntries = List[VTableMethod]

mypyc/ir/ops.py

@@ -1449,5 +1449,6 @@ def visit_keep_alive(self, op: KeepAlive) -> T:
 #
 # (Serialization and deserialization *will* be used for incremental
 # compilation but so far it is not hooked up to anything.)
-DeserMaps = NamedTuple('DeserMaps',
-                       [('classes', Dict[str, 'ClassIR']), ('functions', Dict[str, 'FuncIR'])])
+class DeserMaps(NamedTuple):
+    classes: Dict[str, 'ClassIR']
+    functions: Dict[str, 'FuncIR']

mypyc/primitives/int_ops.py

@@ -135,11 +135,11 @@ def int_unary_op(name: str, c_function_name: str) -> CFunctionDescription:
 #   c_func_description: the C function to call when operands are tagged integers
 #   c_func_negated: whether to negate the C function call's result
 #   c_func_swap_operands: whether to swap lhs and rhs when call the function
-IntComparisonOpDescription = NamedTuple(
-    'IntComparisonOpDescription',  [('binary_op_variant', int),
-                                    ('c_func_description', CFunctionDescription),
-                                    ('c_func_negated', bool),
-                                    ('c_func_swap_operands', bool)])
+class IntComparisonOpDescription(NamedTuple):
+    binary_op_variant: int
+    c_func_description: CFunctionDescription
+    c_func_negated: bool
+    c_func_swap_operands: bool
 
 
 # Equals operation on two boxed tagged integers

mypyc/primitives/registry.py

@@ -46,26 +46,26 @@
 ERR_NEG_INT: Final = 10
 
 
-CFunctionDescription = NamedTuple(
-    'CFunctionDescription',  [('name', str),
-                              ('arg_types', List[RType]),
-                              ('return_type', RType),
-                              ('var_arg_type', Optional[RType]),
-                              ('truncated_type', Optional[RType]),
-                              ('c_function_name', str),
-                              ('error_kind', int),
-                              ('steals', StealsDescription),
-                              ('is_borrowed', bool),
-                              ('ordering', Optional[List[int]]),
-                              ('extra_int_constants', List[Tuple[int, RType]]),
-                              ('priority', int)])
+class CFunctionDescription(NamedTuple):
+    name: str
+    arg_types: List[RType]
+    return_type: RType
+    var_arg_type: Optional[RType]
+    truncated_type: Optional[RType]
+    c_function_name: str
+    error_kind: int
+    steals: StealsDescription
+    is_borrowed: bool
+    ordering: Optional[List[int]]
+    extra_int_constants: List[Tuple[int, RType]]
+    priority: int
 
 
 # A description for C load operations including LoadGlobal and LoadAddress
-LoadAddressDescription = NamedTuple(
-    'LoadAddressDescription',     [('name', str),
-                                   ('type', RType),
-                                   ('src', str)])  # name of the target to load
+class LoadAddressDescription(NamedTuple):
+    name: str
+    type: RType
+    src: str  # name of the target to load
 
 
 # CallC op for method call(such as 'str.join')