Skip to content

Commit 63ff108

Browse files
committed
Make simplifications after dropping python3.6
Signed-off-by: Martin Vrachev <[email protected]>
1 parent 195e1d2 commit 63ff108

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

tests/test_hash.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ def _is_supported_combination(library, algorithm):
4545
if algorithm in blake_algos:
4646
if library == 'pyca_crypto':
4747
return False
48-
# hashlib does not support blake2* if < 3.6
49-
elif library == 'hashlib' and sys.version_info[:2] < (3, 6):
50-
return False
5148
return True
5249

5350

tests/test_signer.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,7 @@
99
import securesystemslib.formats
1010
import securesystemslib.keys as KEYS
1111
from securesystemslib.exceptions import FormatError, UnsupportedAlgorithmError
12-
13-
# TODO: Remove case handling when fully dropping support for versions < 3.6
14-
IS_PY_VERSION_SUPPORTED = sys.version_info >= (3, 6)
15-
16-
# Use setUpModule to tell unittest runner to skip this test module gracefully.
17-
def setUpModule():
18-
if not IS_PY_VERSION_SUPPORTED:
19-
raise unittest.SkipTest("requires Python 3.6 or higher")
20-
21-
# Since setUpModule is called after imports we need to import conditionally.
22-
if IS_PY_VERSION_SUPPORTED:
23-
from securesystemslib.signer import Signature, SSlibSigner
12+
from securesystemslib.signer import Signature, SSlibSigner
2413

2514

2615
class TestSSlibSigner(unittest.TestCase):

0 commit comments

Comments
 (0)