Fix some deepsource issues.

12 files changed, 20 insertions, 33 deletions

diff --git a/pyecsca/ec/divpoly.py b/pyecsca/ec/divpoly.py
index 3ad2495..c66d75d 100644
--- a/pyecsca/ec/divpoly.py
+++ b/pyecsca/ec/divpoly.py
@@ -135,7 +135,7 @@ def divpoly0(curve: EllipticCurve, *ns: int) -> Mapping[int, Poly]:
     x = Kx(xs)
 
     b2, b4, b6, b8 = map(lambda b: Kx(int(b)), b_invariants(curve))
-    ls, vals = dep_map(*ns)
+    ls, _ = dep_map(*ns)
 
     mem: Dict[int, Poly] = {}
     for i, keep in ls:
@@ -147,7 +147,7 @@ def divpoly0(curve: EllipticCurve, *ns: int) -> Mapping[int, Poly]:
             val = Kx(0)
         elif i < 0:
             raise ValueError("n must be a positive integer (or -1 or -2)")
-        elif i == 1 or i == 2:
+        elif i in (1, 2):
             val = Kx(1)
         elif i == 3:
             val = Kx(3) * x ** 4 + b2 * x ** 3 + Kx(3) * b4 * x ** 2 + Kx(3) * b6 * x + b8
@@ -237,8 +237,9 @@ def mult_by_n(curve: EllipticCurve, n: int) -> Tuple[Tuple[Poly, Poly], Tuple[Po
     # numerator by the leading coefficient. Sage does this
     # simplification when asking for multiplication_by_m with the
     # x-only=True, as then the poly is an univariate object.
-    # lc = K(mx_denom.LC())
-    # mx = (mx_num.quo(lc), mx_denom.monic())
+    # >
+    # > lc = K(mx_denom.LC())
+    # > mx = (mx_num.quo(lc), mx_denom.monic())
     mx = (mx_num, mx_denom)
 
     # The following lines compute
@@ -246,23 +247,23 @@ def mult_by_n(curve: EllipticCurve, n: int) -> Tuple[Tuple[Poly, Poly], Tuple[Po
     # just as sage does, but using sympy and step-by-step
     # tracking the numerator and denominator of the fraction.
 
-    # mx.derivative()
+    # > mx.derivative()
     mxd_num = mx[1] * mx[0].diff() - mx[0] * mx[1].diff()
     mxd_denom = mx[1] ** 2
 
-    # mx.derivative()/m
+    # > mx.derivative()/m
     mxd_dn_num = mxd_num
     mxd_dn_denom = mxd_denom * Kxy(n)
 
-    # (2*y+a1*x+a3)*mx.derivative(x)/m
+    # > (2*y+a1*x+a3)*mx.derivative(x)/m
     mxd_full_num = mxd_dn_num * (Kxy(2) * y + Kxy(a1) * x + Kxy(a3))
     mxd_full_denom = mxd_dn_denom
 
-    # a1*mx
+    # > a1*mx
     a1mx_num = (Kxy(a1) * mx[0])
     a1mx_denom = mx[1]  # noqa
 
-    # a3
+    # > a3
     a3_num = (Kxy(a3) * mx[1])
     a3_denom = mx[1]  # noqa
 
diff --git a/pyecsca/ec/op.py b/pyecsca/ec/op.py
index d948129..8841f2c 100644
--- a/pyecsca/ec/op.py
+++ b/pyecsca/ec/op.py
@@ -130,9 +130,9 @@ class CodeOp:
 
     @property
     def parents(self) -> Tuple[Union[str, int]]:
-        if self.operator == OpType.Inv or self.operator == OpType.Neg:
+        if self.operator in (OpType.Inv, OpType.Neg):
             return self.right,  # type: ignore
-        elif self.operator == OpType.Sqr or self.operator == OpType.Id:
+        elif self.operator in (OpType.Sqr, OpType.Id):
             return self.left,  # type: ignore
         else:
             return self.left, self.right  # type: ignore
diff --git a/pyecsca/ec/params.py b/pyecsca/ec/params.py
index 014a479..8f3d092 100644
--- a/pyecsca/ec/params.py
+++ b/pyecsca/ec/params.py
@@ -393,7 +393,7 @@ def load_params_ectester(
         raise TypeError
     if len(line) != 7:
         raise ValueError("Binary extension field curves not supported")
-    # line = p,a,b,gx,gy,n,h (all in hex)
+    # p,a,b,gx,gy,n,h (all in hex)
     curve_dict = {
         "form": "Weierstrass",
         "field": {
diff --git a/pyecsca/sca/re/zvp.py b/pyecsca/sca/re/zvp.py
index 0c7a6ef..536c599 100644
--- a/pyecsca/sca/re/zvp.py
+++ b/pyecsca/sca/re/zvp.py
@@ -8,7 +8,6 @@ Implements ZVP point construction from [FFD]_.
 """
 from typing import List, Set
 from public import public
-import contextlib
 
 from sympy import symbols, FF, Poly, Monomial, Symbol, Expr
 
diff --git a/pyecsca/sca/target/PCSC.py b/pyecsca/sca/target/PCSC.py
index ace59cc..212651b 100644
--- a/pyecsca/sca/target/PCSC.py
+++ b/pyecsca/sca/target/PCSC.py
@@ -22,7 +22,7 @@ class PCSCTarget(ISO7816Target):  # pragma: no cover
                     self.reader = r
                     break
             else:
-                raise ValueError("Reader '{}' not found.".format(reader))
+                raise ValueError(f"Reader '{reader}' not found.")
         else:
             self.reader = reader
         self.connection: PCSCCardConnection = self.reader.createConnection()
diff --git a/pyecsca/sca/target/ectester.py b/pyecsca/sca/target/ectester.py
index e360224..394d86f 100644
--- a/pyecsca/sca/target/ectester.py
+++ b/pyecsca/sca/target/ectester.py
@@ -580,9 +580,7 @@ class ECTesterTarget(ISO7816Target, ABC):  # pragma: no cover
                     version_bytes[2] = 0x39
             else:
                 version_bytes[2] -= 1
-        else:
-            return False
-        return True
+        return False
 
     @staticmethod
     def encode_parameters(
diff --git a/pyecsca/sca/trace_set/base.py b/pyecsca/sca/trace_set/base.py
index d757615..649c8de 100644
--- a/pyecsca/sca/trace_set/base.py
+++ b/pyecsca/sca/trace_set/base.py
@@ -46,6 +46,6 @@ class TraceSet:
 
     def __repr__(self):
         args = ", ".join(
-            ["{}={!r}".format(key, getattr(self, key)) for key in self._keys]
+            [f"{key}={getattr(self, key)!r}" for key in self._keys]
         )
-        return "TraceSet({})".format(args)
+        return f"TraceSet({args})"
diff --git a/pyecsca/sca/trace_set/inspector.py b/pyecsca/sca/trace_set/inspector.py
index 9e18b04..15fc512 100644
--- a/pyecsca/sca/trace_set/inspector.py
+++ b/pyecsca/sca/trace_set/inspector.py
@@ -23,7 +23,7 @@ class SampleCoding(IntEnum):
 
     def dtype(self):
         char = "f" if self.value & 0x10 else "i"
-        return np.dtype("<{}{}".format(char, self.value & 0x0F))
+        return np.dtype(f"<{char}{self.value & 0x0F}")
 
 
 @public
@@ -54,7 +54,7 @@ class Parsers:
 
     @staticmethod
     def write_float(f, length=None):
-        return struct.pack("<{}".format("e" if length == 2 else "f"), f)
+        return struct.pack(f"<{'e' if length == 2 else 'f'}", f)
 
     @staticmethod
     def write_str(s, length=None):
diff --git a/test/ec/perf_mult.py b/test/ec/perf_mult.py
index 521f5e7..e2adf29 100755
--- a/test/ec/perf_mult.py
+++ b/test/ec/perf_mult.py
@@ -45,14 +45,6 @@ def main(profiler, mod, operations, directory):
                 one_point = mult.multiply(
                     0x71A55E0C1ABB3A0E069419E0F837BC195F1B9545E69FC51E53C4D48D7FEA3B1A
                 )
-        # ed25519 = get_params("other", "Ed25519", "extended")
-        # ecoords = ed25519.curve.coordinate_model
-        # dblg = ecoords.formulas["mdbl-2008-hwcd"]
-        # click.echo(f"Profiling {operations} {ed25519.curve.prime.bit_length()}-bit doubling formula executions (with assumption)...")
-        # eone_point = ed25519.generator
-        # with Profiler(profiler) as pr:
-        #     for _ in range(operations):
-        #         dblg(ed25519.curve.prime, eone_point, **ed25519.curve.parameters)
 
 
 if __name__ == "__main__":
diff --git a/test/sca/perf_zvp.py b/test/sca/perf_zvp.py
index fd0e7d1..2713009 100644
--- a/test/sca/perf_zvp.py
+++ b/test/sca/perf_zvp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 import click
 
-from datetime import datetime
 from pyecsca.ec.mod import has_gmp
 from pyecsca.misc.cfg import TemporaryConfig
 from pyecsca.sca.re.zvp import zvp_point, unroll_formula
diff --git a/test/sca/test_target.py b/test/sca/test_target.py
index 4155b25..223b7cb 100644
--- a/test/sca/test_target.py
+++ b/test/sca/test_target.py
@@ -11,7 +11,7 @@ from pyecsca.ec.key_agreement import ECDH_SHA1
 from pyecsca.ec.key_generation import KeyGeneration
 from pyecsca.ec.mod import Mod
 from pyecsca.ec.mult import LTRMultiplier
-from pyecsca.ec.params import DomainParameters, get_params
+from pyecsca.ec.params import get_params
 from pyecsca.ec.signature import SignatureResult, ECDSA_SHA1
 from pyecsca.sca.target import (
     BinaryTarget,
diff --git a/test/sca/test_zvp.py b/test/sca/test_zvp.py
index 39e35ea..0a625f9 100644
--- a/test/sca/test_zvp.py
+++ b/test/sca/test_zvp.py
@@ -1,5 +1,3 @@
-import secrets
-
 import pytest
 
 from pyecsca.ec.coordinates import AffineCoordinateModel