diff options
| author | Joshua Li <josh@jrl.ninja> | 2020-06-02 19:53:46 -0700 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2020-06-03 14:30:37 +1000 |
| commit | d0f0aa9f17ad1786ac88457ca5b56222849ebe1a (patch) | |
| tree | 2a2ab02b9fdfa90a766f44679d83f7e09060c385 /tests | |
| parent | ec2018d66492e7eff5da7d02c801f19b2a60814b (diff) | |
remove version_info based branching
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/client/test_helpers.py | 7 | ||||
| -rw-r--r-- | tests/conftest.py | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tests/client/test_helpers.py b/tests/client/test_helpers.py index 3a64142..3ed588f 100644 --- a/tests/client/test_helpers.py +++ b/tests/client/test_helpers.py @@ -1,4 +1,3 @@ -import sys import io import socket from socket import AF_INET, AF_INET6 @@ -193,9 +192,5 @@ def test_family_ip_tuple(): def test_family_to_string(): assert sshuttle.helpers.family_to_string(AF_INET) == "AF_INET" assert sshuttle.helpers.family_to_string(AF_INET6) == "AF_INET6" - if sys.version_info < (3, 0): - expected = "1" - assert sshuttle.helpers.family_to_string(socket.AF_UNIX) == "1" - else: - expected = 'AddressFamily.AF_UNIX' + expected = 'AddressFamily.AF_UNIX' assert sshuttle.helpers.family_to_string(socket.AF_UNIX) == expected diff --git a/tests/conftest.py b/tests/conftest.py index 2a7e6c5..95052f1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,9 +1,6 @@ import sys -if sys.version_info >= (3, 0): - good_python = sys.version_info >= (3, 5) -else: - good_python = sys.version_info >= (2, 7) +good_python = sys.version_info >= (3, 5) collect_ignore = [] if not good_python: |