Updates

Signed-off-by: Vlad Gheorghiu <[email protected]>

Author: vsoftco

oqs/oqs.py

@@ -45,7 +45,7 @@ def _countdown(seconds):
 def _load_shared_obj(name, additional_searching_paths=None):
     """Attempts to load shared library."""
     paths = []
-    dll = ct.windll if platform.system() == "Windows" else ct.cdll
+    dll = ct.windll if platform.system() == "Windows" else ct.cdll  # type: ignore
 
     # Search additional path, if any
     if additional_searching_paths:
@@ -152,7 +152,7 @@ def native():
 def oqs_version():
     """liboqs version string."""
     native().OQS_version.restype = ct.c_char_p
-    return ct.c_char_p(native().OQS_version()).value.decode("UTF-8")
+    return ct.c_char_p(native().OQS_version()).value.decode()  # type: ignore
 
 
 # Warn the user if the liboqs version differs from liboqs-python version
@@ -252,7 +252,7 @@ def __init__(self, alg_name, secret_key=None):
     def __enter__(self):
         return self
 
-    def __exit__(self, ctx_type, ctx_value, ctx_traceback):
+    def __exit__(self, _ctx_type, _ctx_value, _ctx_traceback):
         self.free()
 
     def generate_keypair(self):
@@ -418,7 +418,7 @@ def __init__(self, alg_name, secret_key=None):
     def __enter__(self):
         return self
 
-    def __exit__(self, ctx_type, ctx_value, ctx_traceback):
+    def __exit__(self, _ctx_type, _ctx_value, _ctx_traceback):
         self.free()
 
     def generate_keypair(self):

tests/test_kem.py

@@ -42,17 +42,17 @@ def check_wrong_ciphertext(alg_name):
         except RuntimeError:
             pass
         except Exception as ex:
-            raise AssertionError("An unexpected exception was raised. " + ex)
+            raise AssertionError(f"An unexpected exception was raised: {ex}")
 
 
 def test_not_supported():
     try:
-        with oqs.KeyEncapsulation("bogus") as kem:
+        with oqs.KeyEncapsulation("bogus"):
             raise AssertionError("oqs.MechanismNotSupportedError was not raised.")
     except oqs.MechanismNotSupportedError:
         pass
     except Exception as ex:
-        raise AssertionError("An unexpected exception was raised. " + ex)
+        raise AssertionError(f"An unexpected exception was raised {ex}")
 
 
 def test_not_enabled():
@@ -61,21 +61,18 @@ def test_not_enabled():
         if alg_name not in oqs.get_enabled_kem_mechanisms():
             # Found a non-enabled but supported alg
             try:
-                with oqs.KeyEncapsulation(alg_name) as kem:
+                with oqs.KeyEncapsulation(alg_name):
                     raise AssertionError("oqs.MechanismNotEnabledError was not raised.")
             except oqs.MechanismNotEnabledError:
                 pass
             except Exception as ex:
-                raise AssertionError("An unexpected exception was raised. " + ex)
+                raise AssertionError(f"An unexpected exception was raised: {ex}")
 
 
 if __name__ == "__main__":
     try:
         import nose2
 
         nose2.main()
-
     except ImportError:
-        import nose
-
-        nose.runmodule()
+        raise RuntimeError("nose2 module not found, required to run the unit tests")

tests/test_sig.py

@@ -92,12 +92,12 @@ def check_wrong_public_key(alg_name):
 
 def test_not_supported():
     try:
-        with oqs.Signature("bogus") as sig:
+        with oqs.Signature("bogus"):
             raise AssertionError("oqs.MechanismNotSupportedError was not raised.")
     except oqs.MechanismNotSupportedError:
         pass
     except Exception as ex:
-        raise AssertionError("An unexpected exception was raised. " + ex)
+        raise AssertionError(f"An unexpected exception was raised: {ex}")
 
 
 def test_not_enabled():
@@ -106,21 +106,18 @@ def test_not_enabled():
         if alg_name not in oqs.get_enabled_sig_mechanisms():
             # Found a non-enabled but supported alg
             try:
-                with oqs.Signature(alg_name) as sig:
+                with oqs.Signature(alg_name):
                     raise AssertionError("oqs.MechanismNotEnabledError was not raised.")
             except oqs.MechanismNotEnabledError:
                 pass
             except Exception as ex:
-                raise AssertionError("An unexpected exception was raised. " + ex)
+                raise AssertionError(f"An unexpected exception was raised: {ex}")
 
 
 if __name__ == "__main__":
     try:
         import nose2
 
         nose2.main()
-
     except ImportError:
-        import nose
-
-        nose.runmodule()
+        raise RuntimeError("nose2 module not found, required to run the unit tests")