Flake8 fixes

sklam · Mar 21, 2023 · Jul 29, 2022 · Aug 22, 2022 · Feb 25, 2022 · Aug 22, 2022
commit 04759154a8ec0b2769ffbc1061620e54086b51da
diff --git a/numba/core/bytecode.py b/numba/core/bytecode.py
@@ -328,6 +328,7 @@ def find_exception_entry(self, offset):
             ent = max(candidates)[1]
             return ent
 
+
 class FunctionIdentity(serialize.ReduceMixin):
     """
     A function's identity and metadata.

@@ -10,7 +10,7 @@
 from numba.core.utils import UniqueDict, PYVERSION
 from numba.core.controlflow import NEW_BLOCKERS, CFGraph
 from numba.core.ir import Loc
-from numba.core.errors import UnsupportedError, CompilerError
+from numba.core.errors import UnsupportedError
 
 
 _logger = logging.getLogger(__name__)
@@ -113,7 +113,8 @@ def run(self):
                     # Terminated?
                     if state.has_terminated():
                         break
-                    elif not state.in_with() and (state.has_active_try() and
+                    elif not state.in_with() and (
+                            state.has_active_try() and
                             state.get_inst().opname not in _NO_RAISE_OPS):
                         # Is in a *try* block
                         state.fork(pc=state.get_inst().next)
@@ -125,18 +126,21 @@ def run(self):
                         # Must the new PC be a new block?
                         if PYVERSION == (3, 11):
                             if not state.in_with() and state.is_in_exception():
-                                _logger.debug("3.11 exception %s PC=%s", state.get_exception(), state._pc)
+                                _logger.debug("3.11 exception %s PC=%s",
+                                              state.get_exception(), state._pc)
                                 eh = state.get_exception()
                                 eh_top = state.get_top_block('TRY')
                                 if eh_top and eh_top['end'] == eh.target:
                                     # Same exception
                                     eh_block = None
                                 else:
-                                    eh_block = state.make_block("TRY", end=eh.target)
+                                    eh_block = state.make_block(
+                                        "TRY", end=eh.target)
                                     eh_block['end_offset'] = eh.end
                                     eh_block['stack_depth'] = eh.depth
                                     eh_block['push_lasti'] = eh.lasti
-                                    state.fork(pc=state._pc, extra_block=eh_block)
+                                    state.fork(pc=state._pc,
+                                               extra_block=eh_block)
                                     break
 
                         if self._is_implicit_new_block(state):
@@ -839,7 +843,6 @@ def op_BEFORE_WITH(self, state, inst):
         # Forces a new block
         state.fork(pc=inst.next)
 
-
     def op_SETUP_WITH(self, state, inst):
         cm = state.pop()    # the context-manager
 
@@ -891,7 +894,6 @@ def op_PUSH_EXC_INFO(self, state, inst):
         state.push(state.make_temp("exception"))
         state.push(tos)
 
-
     def op_SETUP_EXCEPT(self, state, inst):
         # Opcode removed since py3.8
         state.append(inst)
@@ -913,7 +915,7 @@ def op_POP_EXCEPT(self, state, inst):
             blk = state.pop_block()
             if blk['kind'] not in {BlockKind('EXCEPT'), BlockKind('FINALLY')}:
                 raise UnsupportedError(
-                    "POP_EXCEPT got an unexpected block: {}".format(blk['kind']),
+                    f"POP_EXCEPT got an unexpected block: {blk['kind']}",
                     loc=self.get_debug_loc(inst.lineno),
                 )
             state.pop()
@@ -1648,7 +1650,8 @@ def get_outgoing_states(self):
         for edge in self._outedges:
             state = State(bytecode=self._bytecode, pc=edge.pc,
                           nstack=len(edge.stack), blockstack=edge.blockstack,
-                          nullvals=[i for i, v in enumerate(edge.stack) if _is_null_temp_reg(v)])
+                          nullvals=[i for i, v in enumerate(edge.stack)
+                                    if _is_null_temp_reg(v)])
             ret.append(state)
             # Map outgoing_phis
             for phi, i in state._phis.items():
@@ -1695,6 +1698,7 @@ def in_with(self):
             if ent["kind"] == BlockKind("WITH"):
                 return True
 
+
 if PYVERSION >= (3, 11):
     State = StatePy311
 

diff --git a/numba/core/controlflow.py b/numba/core/controlflow.py
@@ -8,7 +8,9 @@
 
 # List of bytecodes creating a new block in the control flow graph
 # (in addition to explicit jump labels).
-NEW_BLOCKERS = frozenset(['SETUP_LOOP', 'FOR_ITER', 'SETUP_WITH', 'BEFORE_WITH'])
+NEW_BLOCKERS = frozenset([
+    'SETUP_LOOP', 'FOR_ITER', 'SETUP_WITH', 'BEFORE_WITH'
+])
 
 
 class CFBlock(object):

@@ -1520,7 +1520,6 @@ def _start_new_block(self, offset):
             if newtryblk is not tryblk:
                 self._insert_try_block_begin()
 
-
     def _end_current_block(self):
         # Handle try block
         if not self.current_block.is_terminated:
@@ -2816,7 +2815,7 @@ def _jump_if_none(self, inst, pred, iftrue):
         op = BINOPS_TO_OPERATORS["is"]
 
         lhs = self.store(value=ir.Const(None, loc=self.loc),
-                            name="${inst.offset}constnone")
+                         name="${inst.offset}constnone")
         rhs = self.get(pred)
         isnone = ir.Expr.binop(op, lhs=lhs, rhs=rhs, loc=self.loc)
 
@@ -2898,7 +2897,7 @@ def op_RERAISE(self, inst, exc):
             # Numba can't handle this case and it's caught else where, this is a
             # runtime guard in case this is reached by unknown means.
             msg = (f"Unreachable condition reached (op code RERAISE executed)"
-                f"{error_extras['reportable']}")
+                   f"{error_extras['reportable']}")
             stmt = ir.StaticRaise(AssertionError, (msg,), self.loc)
             self.current_block.append(stmt)
 

diff --git a/numba/core/lowering.py b/numba/core/lowering.py
@@ -20,6 +20,7 @@
 
 _VarArgItem = namedtuple("_VarArgItem", ("vararg", "index"))
 
+
 class BaseLower(object):
     """
     Lower IR to LLVM
@@ -304,7 +305,8 @@ def typeof(self, varname):
 
     def debug_print(self, msg):
         if config.DEBUG_JIT:
-            self.context.debug_print(self.builder, f"DEBUGJIT [{self.fndesc.qualname}]: {msg}")
+            self.context.debug_print(
+                self.builder, f"DEBUGJIT [{self.fndesc.qualname}]: {msg}")
 
     def print_variable(self, msg, varname):
         """Helper to emit ``print(msg, varname)`` for debugging.