[mypyc] Fix lint errors in imported mypyc code

msullivan · msullivan · commit ba9b3eb2ec19 · 2019-08-21T11:21:35.000-07:00
diff --git a/mypyc/__init__.py b/mypyc/__init__.py
@@ -1 +0,0 @@
-
diff --git a/mypyc/emit.py b/mypyc/emit.py
@@ -1,7 +1,7 @@
 """Utilities for emitting C code."""
 
 from collections import OrderedDict
-from typing import List, Set, Dict, Optional, List, Callable, Union
+from typing import List, Set, Dict, Optional, Callable, Union
 
 from mypyc.common import (
     REG_PREFIX, ATTR_PREFIX, STATIC_PREFIX, TYPE_PREFIX, NATIVE_PREFIX,
diff --git a/mypyc/emitmodule.py b/mypyc/emitmodule.py
@@ -22,7 +22,6 @@
 from mypyc.uninit import insert_uninit_checks
 from mypyc.refcount import insert_ref_count_opcodes
 from mypyc.exceptions import insert_exception_handling
-from mypyc.emit import EmitterContext, Emitter, HeaderDeclaration
 from mypyc.namegen import exported_name
 
 
diff --git a/mypyc/genops.py b/mypyc/genops.py
@@ -65,7 +65,7 @@ def f(x: int) -> int:
     bool_rprimitive, list_rprimitive, is_list_rprimitive, dict_rprimitive, set_rprimitive,
     str_rprimitive, tuple_rprimitive, none_rprimitive, is_none_rprimitive, object_rprimitive,
     exc_rtuple,
-    PrimitiveOp, ControlOp, LoadErrorValue, OpDescription, RegisterOp,
+    PrimitiveOp, ControlOp, OpDescription, RegisterOp,
     is_object_rprimitive, LiteralsMap, FuncSignature, VTableAttr, VTableMethod, VTableEntries,
     NAMESPACE_TYPE, RaiseStandardError, LoadErrorValue, NO_TRACEBACK_LINE_NO, FuncDecl,
     FUNC_NORMAL, FUNC_STATICMETHOD, FUNC_CLASSMETHOD,
@@ -4502,10 +4502,10 @@ def op_arg_type(self, desc: OpDescription, n: int) -> RType:
     @overload
     def accept(self, node: Expression) -> Value: ...
 
-    @overload
+    @overload  # noqa
     def accept(self, node: Statement) -> None: ...
 
-    def accept(self, node: Union[Statement, Expression]) -> Optional[Value]:
+    def accept(self, node: Union[Statement, Expression]) -> Optional[Value]:  # noqa
         with self.catch_errors(node.line):
             if isinstance(node, Expression):
                 try:
diff --git a/mypyc/ops.py b/mypyc/ops.py
@@ -440,7 +440,7 @@ def add(self, reg: 'Value', name: str) -> None:
 
     def add_local(self, symbol: SymbolNode, typ: RType, is_arg: bool = False) -> 'Register':
         assert isinstance(symbol, SymbolNode)
-        reg = Register(typ, symbol.line, is_arg = is_arg)
+        reg = Register(typ, symbol.line, is_arg=is_arg)
         self.symtable[symbol] = AssignmentTargetRegister(reg)
         self.add(reg, symbol.name())
         return reg
diff --git a/mypyc/ops_exc.py b/mypyc/ops_exc.py
@@ -14,35 +14,35 @@
     arg_types=[object_rprimitive],
     result_type=bool_rprimitive,
     error_kind=ERR_FALSE,
-    format_str = 'raise_exception({args[0]}); {dest} = 0',
+    format_str='raise_exception({args[0]}); {dest} = 0',
     emit=simple_emit('CPy_Raise({args[0]}); {dest} = 0;'))
 
 set_stop_iteration_value = custom_op(
     arg_types=[object_rprimitive],
     result_type=bool_rprimitive,
     error_kind=ERR_FALSE,
-    format_str = 'set_stop_iteration_value({args[0]}); {dest} = 0',
+    format_str='set_stop_iteration_value({args[0]}); {dest} = 0',
     emit=simple_emit('CPyGen_SetStopIterationValue({args[0]}); {dest} = 0;'))
 
 raise_exception_with_tb_op = custom_op(
     arg_types=[object_rprimitive, object_rprimitive, object_rprimitive],
     result_type=bool_rprimitive,
     error_kind=ERR_FALSE,
-    format_str = 'raise_exception_with_tb({args[0]}, {args[1]}, {args[2]}); {dest} = 0',
+    format_str='raise_exception_with_tb({args[0]}, {args[1]}, {args[2]}); {dest} = 0',
     emit=simple_emit('CPyErr_SetObjectAndTraceback({args[0]}, {args[1]}, {args[2]}); {dest} = 0;'))
 
 reraise_exception_op = custom_op(
     arg_types=[],
     result_type=bool_rprimitive,
     error_kind=ERR_FALSE,
-    format_str = 'reraise_exc; {dest} = 0',
+    format_str='reraise_exc; {dest} = 0',
     emit=simple_emit('CPy_Reraise(); {dest} = 0;'))
 
 no_err_occurred_op = custom_op(
     arg_types=[],
     result_type=bool_rprimitive,
     error_kind=ERR_FALSE,
-    format_str = '{dest} = no_err_occurred',
+    format_str='{dest} = no_err_occurred',
     emit=simple_emit('{dest} = (PyErr_Occurred() == NULL);'))
 
 assert_err_occured_op = custom_op(
@@ -56,7 +56,7 @@
     arg_types=[],
     result_type=bool_rprimitive,
     error_kind=ERR_FALSE,
-    format_str = '{dest} = keep_propagating',
+    format_str='{dest} = keep_propagating',
     emit=simple_emit('{dest} = 0;'))
 
 # Catches a propagating exception and makes it the "currently
@@ -67,7 +67,7 @@
     arg_types=[],
     result_type=exc_rtuple,
     error_kind=ERR_NEVER,
-    format_str = '{dest} = error_catch',
+    format_str='{dest} = error_catch',
     emit=simple_emit('CPy_CatchError(&{dest}.f0, &{dest}.f1, &{dest}.f2);'))
 
 # Restore an old "currently handled exception" returned from
@@ -76,28 +76,28 @@
     arg_types=[exc_rtuple],
     result_type=void_rtype,
     error_kind=ERR_NEVER,
-    format_str = 'restore_exc_info {args[0]}',
+    format_str='restore_exc_info {args[0]}',
     emit=simple_emit('CPy_RestoreExcInfo({args[0]}.f0, {args[0]}.f1, {args[0]}.f2);'))
 
 # Checks whether the exception currently being handled matches a particular type.
 exc_matches_op = custom_op(
     arg_types=[object_rprimitive],
     result_type=bool_rprimitive,
     error_kind=ERR_NEVER,
-    format_str = '{dest} = exc_matches {args[0]}',
+    format_str='{dest} = exc_matches {args[0]}',
     emit=simple_emit('{dest} = CPy_ExceptionMatches({args[0]});'))
 
 # Get the value of the exception currently being handled.
 get_exc_value_op = custom_op(
     arg_types=[],
     result_type=object_rprimitive,
     error_kind=ERR_NEVER,
-    format_str = '{dest} = get_exc_value',
+    format_str='{dest} = get_exc_value',
     emit=simple_emit('{dest} = CPy_GetExcValue();'))
 
 get_exc_info_op = custom_op(
     arg_types=[],
     result_type=exc_rtuple,
     error_kind=ERR_NEVER,
-    format_str = '{dest} = get_exc_info',
+    format_str='{dest} = get_exc_info',
     emit=simple_emit('CPy_GetExcInfo(&{dest}.f0, &{dest}.f1, &{dest}.f2);'))
diff --git a/mypyc/ops_misc.py b/mypyc/ops_misc.py
@@ -8,7 +8,7 @@
 )
 from mypyc.ops_primitive import (
     name_ref_op, simple_emit, binary_op, unary_op, func_op, method_op, custom_op,
-    simple_emit, negative_int_emit,
+    negative_int_emit,
     call_emit, name_emit, call_negative_bool_emit, call_negative_magic_emit,
 )
 
@@ -304,7 +304,7 @@
     format_str='{dest} = py_calc_metaclass({comma_args})',
     emit=simple_emit(
         '{dest} = (PyObject*) _PyType_CalculateMetaclass((PyTypeObject *){args[0]}, {args[1]});'),
-    is_borrowed = True
+    is_borrowed=True
 )
 
 py_delattr_op = func_op(
diff --git a/mypyc/refcount.py b/mypyc/refcount.py
@@ -24,7 +24,6 @@
     analyze_live_regs,
     analyze_borrowed_arguments,
     cleanup_cfg,
-    analyze_must_defined_regs,
     AnalysisDict
 )
 from mypyc.ops import (

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`)`
`9`	`9`	`from mypyc.ops_primitive import (`
`10`	`10`	`name_ref_op, simple_emit, binary_op, unary_op, func_op, method_op, custom_op,`
`11`		`- simple_emit, negative_int_emit,`
	`11`	`+ negative_int_emit,`
`12`	`12`	`call_emit, name_emit, call_negative_bool_emit, call_negative_magic_emit,`
`13`	`13`	`)`
`14`	`14`
`@@ -304,7 +304,7 @@`
`304`	`304`	`format_str='{dest} = py_calc_metaclass({comma_args})',`
`305`	`305`	`emit=simple_emit(`
`306`	`306`	`'{dest} = (PyObject) _PyType_CalculateMetaclass((PyTypeObject ){args[0]}, {args[1]});'),`
`307`		`- is_borrowed = True`
	`307`	`+ is_borrowed=True`
`308`	`308`	`)`
`309`	`309`
`310`	`310`	`py_delattr_op = func_op(`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`analyze_live_regs,`
`25`	`25`	`analyze_borrowed_arguments,`
`26`	`26`	`cleanup_cfg,`
`27`		`- analyze_must_defined_regs,`
`28`	`27`	`AnalysisDict`
`29`	`28`	`)`
`30`	`29`	`from mypyc.ops import (`