Merge pull request #232 from tomato42/fix-lgtm

fix LGTM alerts

Author: tomato42

src/ecdsa/__init__.py

@@ -1,3 +1,6 @@
+# while we don't use six in this file, we did bundle it for a long time, so
+# keep as part of module in a virtual way (through __all__)
+import six
 from .keys import (
     SigningKey,
     VerifyingKey,
@@ -80,5 +83,6 @@
     SECP112r2,
     SECP128r1,
     SECP160r1,
+    six.b(""),
 ]
 del _hush_pyflakes

src/ecdsa/ellipticcurve.py

@@ -641,7 +641,7 @@ def mul_add(self, self_mul, other, other_mul):
 
         calculates self*self_mul + other*other_mul
         """
-        if other is INFINITY or other_mul == 0:
+        if other == INFINITY or other_mul == 0:
             return self * self_mul
         if self_mul == 0:
             return other * other_mul

src/ecdsa/numbertheory.py

@@ -334,7 +334,6 @@ def factorization(n):
         return []
 
     result = []
-    d = 2
 
     # Test the small primes:
 

src/ecdsa/test_der.py

@@ -9,7 +9,7 @@
     import unittest
 from six import b
 import hypothesis.strategies as st
-from hypothesis import given, example
+from hypothesis import given
 import pytest
 from ._compat import str_idx_as_int
 from .curves import NIST256p, NIST224p

src/ecdsa/test_ecdh.py

@@ -2,7 +2,7 @@
 import shutil
 import subprocess
 import pytest
-from binascii import hexlify, unhexlify
+from binascii import unhexlify
 
 try:
     import unittest2 as unittest

src/ecdsa/test_ellipticcurve.py

@@ -1,5 +1,4 @@
 import pytest
-from six import print_
 
 try:
     import unittest2 as unittest
@@ -96,7 +95,7 @@ def test_conflation_curves(self):
         self.assertEqual(len(set((c_23, eq1, eq2, eq3))), 1)
         self.assertEqual(len(set((c_23, ne1, ne2, ne3))), 4)
         self.assertDictEqual({c_23: None}, {eq1: None})
-        self.assertTrue(eq2 in {eq3: None})
+        self.assertIn(eq2, {eq3: None})
 
 
 class TestPoint(unittest.TestCase):

src/ecdsa/test_jacobi.py

@@ -8,7 +8,7 @@
 import hypothesis.strategies as st
 from hypothesis import given, assume, settings, example
 
-from .ellipticcurve import CurveFp, Point, PointJacobi, INFINITY
+from .ellipticcurve import CurveFp, PointJacobi, INFINITY
 from .ecdsa import (
     generator_256,
     curve_256,
@@ -473,8 +473,6 @@ def test_mul_add_without_order(self):
     def test_mul_add_with_doubled_negation_of_itself(self):
         j_g = PointJacobi.from_affine(generator_256 * 17)
 
-        order = generator_256.order()
-
         dbl_neg = 2 * (-j_g)
 
         self.assertEqual(j_g.mul_add(4, dbl_neg, 2), INFINITY)

src/ecdsa/test_keys.py

@@ -9,8 +9,6 @@
     buffer = memoryview
 
 import array
-import six
-import sys
 import pytest
 import hashlib
 

src/ecdsa/test_malformed_sigs.py

@@ -16,15 +16,14 @@
 from functools import partial
 import pytest
 import sys
-from six import binary_type
 import hypothesis.strategies as st
 from hypothesis import note, assume, given, settings, example
 
 from .keys import SigningKey
 from .keys import BadSignatureError
 from .util import sigencode_der, sigencode_string
 from .util import sigdecode_der, sigdecode_string
-from .curves import curves, NIST256p
+from .curves import curves
 from .der import (
     encode_integer,
     encode_bitstring,

src/ecdsa/test_numbertheory.py

@@ -1,7 +1,5 @@
 import operator
-from six import print_
 from functools import reduce
-import operator
 
 try:
     import unittest2 as unittest