From 789e136aefffc263bafa6996d3176ad575c333dc Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 21 Sep 2017 17:13:05 -0400 Subject: [PATCH 1/3] Drop py26 from tox.ini --- tox.ini | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tox.ini b/tox.ini index 6e00446c..111dd754 100644 --- a/tox.ini +++ b/tox.ini @@ -4,8 +4,7 @@ # and then run "tox" from this directory. [tox] -#envlist = py26, py27, py35 -envlist = py27 +envlist = py27, py35 [testenv] changedir = tests @@ -19,12 +18,3 @@ deps = -r{toxinidir}/requirements.txt install_command = pip install --pre {opts} {packages} - - -[testenv:py26] -deps = - -r{toxinidir}/requirements.txt - unittest2 - importlib - -install_command = pip install --pre {opts} {packages} From eedff4aa32f446813de8ca4117215a1f81b8b32d Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 21 Sep 2017 17:14:33 -0400 Subject: [PATCH 2/3] Drop py26 from setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 4be0a2e6..fc5050a6 100755 --- a/setup.py +++ b/setup.py @@ -95,7 +95,6 @@ 'Operating System :: Microsoft :: Windows', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', From 72d7ebfd8d8f474789b6ca8d59ae8f69d827a5f1 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 21 Sep 2017 17:16:29 -0400 Subject: [PATCH 3/3] Remove py26 conditional import statements --- tests/aggregate_tests.py | 7 ------- tests/test_arbitrary_package_attack.py | 8 +------- tests/test_developer_tool.py | 1 + tests/test_endless_data_attack.py | 8 +------- tests/test_extraneous_dependencies_attack.py | 8 +------- tests/test_indefinite_freeze_attack.py | 8 +------- tests/test_interpose_updater.py | 8 +------- tests/test_key_revocation_integration.py | 8 +------- tests/test_mix_and_match_attack.py | 8 +------- tests/test_multiple_repositories_integration.py | 8 +------- tests/test_replay_attack.py | 12 +++--------- tests/test_repository_lib.py | 8 +------- tests/test_repository_tool.py | 7 ------- tests/test_root_versioning_integration.py | 7 +------ tests/test_slow_retrieval_attack.py | 8 +------- tests/test_updater_root_rotation_integration.py | 8 +------- tuf/download.py | 2 +- 17 files changed, 17 insertions(+), 107 deletions(-) diff --git a/tests/aggregate_tests.py b/tests/aggregate_tests.py index 4b9f6dd4..b65077a5 100755 --- a/tests/aggregate_tests.py +++ b/tests/aggregate_tests.py @@ -36,13 +36,6 @@ import glob import random -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest - # Generate a list of pathnames that match a pattern (i.e., that begin with # 'test_' and end with '.py'. A shell-style wildcard is used with glob() to # match desired filenames. All the tests matching the pattern will be loaded diff --git a/tests/test_arbitrary_package_attack.py b/tests/test_arbitrary_package_attack.py index 89ab017c..99cc2fb0 100755 --- a/tests/test_arbitrary_package_attack.py +++ b/tests/test_arbitrary_package_attack.py @@ -42,13 +42,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf import tuf.formats diff --git a/tests/test_developer_tool.py b/tests/test_developer_tool.py index a21dd0d0..61585eb2 100755 --- a/tests/test_developer_tool.py +++ b/tests/test_developer_tool.py @@ -22,6 +22,7 @@ import logging import tempfile import shutil +import unittest import tuf import tuf.log diff --git a/tests/test_endless_data_attack.py b/tests/test_endless_data_attack.py index fc665012..be0d8963 100755 --- a/tests/test_endless_data_attack.py +++ b/tests/test_endless_data_attack.py @@ -45,13 +45,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf import tuf.formats diff --git a/tests/test_extraneous_dependencies_attack.py b/tests/test_extraneous_dependencies_attack.py index 8f8a7d8c..0e78578f 100755 --- a/tests/test_extraneous_dependencies_attack.py +++ b/tests/test_extraneous_dependencies_attack.py @@ -47,13 +47,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf.formats import tuf.log diff --git a/tests/test_indefinite_freeze_attack.py b/tests/test_indefinite_freeze_attack.py index fd75141b..4f885492 100755 --- a/tests/test_indefinite_freeze_attack.py +++ b/tests/test_indefinite_freeze_attack.py @@ -50,13 +50,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf.formats import tuf.log diff --git a/tests/test_interpose_updater.py b/tests/test_interpose_updater.py index 93583d5d..9e4b1d7f 100755 --- a/tests/test_interpose_updater.py +++ b/tests/test_interpose_updater.py @@ -32,6 +32,7 @@ import time import copy import json +import unittest import tuf import tuf.roledb @@ -43,13 +44,6 @@ import securesystemslib -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest - - logger = logging.getLogger('tuf.test_interpose_updater') diff --git a/tests/test_key_revocation_integration.py b/tests/test_key_revocation_integration.py index b673944d..26577b45 100755 --- a/tests/test_key_revocation_integration.py +++ b/tests/test_key_revocation_integration.py @@ -43,13 +43,7 @@ import random import subprocess import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf import tuf.log diff --git a/tests/test_mix_and_match_attack.py b/tests/test_mix_and_match_attack.py index 61c1bdbc..845f473e 100755 --- a/tests/test_mix_and_match_attack.py +++ b/tests/test_mix_and_match_attack.py @@ -44,13 +44,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf.exceptions import tuf.log diff --git a/tests/test_multiple_repositories_integration.py b/tests/test_multiple_repositories_integration.py index 16a2f388..6d448864 100755 --- a/tests/test_multiple_repositories_integration.py +++ b/tests/test_multiple_repositories_integration.py @@ -36,6 +36,7 @@ import logging import time import shutil +import unittest import tuf import tuf.log @@ -45,13 +46,6 @@ import tuf.unittest_toolbox as unittest_toolbox import tuf.repository_tool as repo_tool -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest - logger = logging.getLogger('test_multiple_repositories_integration') repo_tool.disable_console_log_messages() diff --git a/tests/test_replay_attack.py b/tests/test_replay_attack.py index 9fb7c7a8..30866ade 100755 --- a/tests/test_replay_attack.py +++ b/tests/test_replay_attack.py @@ -45,13 +45,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf.formats import tuf.log @@ -62,8 +56,8 @@ import securesystemslib import six -# The repository tool is imported and logs console messages by default. Disable -# console log messages generated by this unit test. +# The repository tool is imported and logs console messages by default. +# Disable console log messages generated by this unit test. repo_tool.disable_console_log_messages() logger = logging.getLogger('tuf.test_replay_attack') diff --git a/tests/test_repository_lib.py b/tests/test_repository_lib.py index 95f4bfb8..584e0ca9 100755 --- a/tests/test_repository_lib.py +++ b/tests/test_repository_lib.py @@ -34,13 +34,7 @@ import shutil import stat import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf import tuf.formats diff --git a/tests/test_repository_tool.py b/tests/test_repository_tool.py index a6a48320..9d007771 100755 --- a/tests/test_repository_tool.py +++ b/tests/test_repository_tool.py @@ -35,13 +35,6 @@ import sys import errno -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest - import tuf import tuf.log import tuf.formats diff --git a/tests/test_root_versioning_integration.py b/tests/test_root_versioning_integration.py index c68a9d8f..25b2200e 100755 --- a/tests/test_root_versioning_integration.py +++ b/tests/test_root_versioning_integration.py @@ -27,12 +27,7 @@ import tempfile import shutil import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest import tuf import tuf.log diff --git a/tests/test_slow_retrieval_attack.py b/tests/test_slow_retrieval_attack.py index 11e46898..4779185e 100755 --- a/tests/test_slow_retrieval_attack.py +++ b/tests/test_slow_retrieval_attack.py @@ -48,13 +48,7 @@ import subprocess import logging import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf.log import tuf.client.updater as updater diff --git a/tests/test_updater_root_rotation_integration.py b/tests/test_updater_root_rotation_integration.py index 27a1190c..2e2c8dc5 100755 --- a/tests/test_updater_root_rotation_integration.py +++ b/tests/test_updater_root_rotation_integration.py @@ -47,13 +47,7 @@ import random import subprocess import sys - -# 'unittest2' required for testing under Python < 2.7. -if sys.version_info >= (2, 7): - import unittest - -else: - import unittest2 as unittest +import unittest import tuf import tuf.log diff --git a/tuf/download.py b/tuf/download.py index e1f7ab2e..f9e3f69e 100755 --- a/tuf/download.py +++ b/tuf/download.py @@ -44,7 +44,7 @@ import six # 'ssl.match_hostname' was added in Python 3.2. The vendored version is needed -# for Python 2.6 and 2.7. +# for Python 2.7. try: from ssl import match_hostname, CertificateError