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 | |
| parent | ec2018d66492e7eff5da7d02c801f19b2a60814b (diff) | |
remove version_info based branching
| -rw-r--r-- | sshuttle/client.py | 7 | ||||
| -rw-r--r-- | sshuttle/helpers.py | 11 | ||||
| -rw-r--r-- | tests/client/test_helpers.py | 7 | ||||
| -rw-r--r-- | tests/conftest.py | 5 |
4 files changed, 6 insertions, 24 deletions
diff --git a/sshuttle/client.py b/sshuttle/client.py index efdaae1..9a0f15b 100644 --- a/sshuttle/client.py +++ b/sshuttle/client.py @@ -228,12 +228,7 @@ class FirewallClient: pass self.argv = argv s1.close() - if sys.version_info < (3, 0): - # python 2.7 - self.pfile = s2.makefile('wb+') - else: - # python 3.5 - self.pfile = s2.makefile('rwb') + self.pfile = s2.makefile('rwb') if e: log('Spawning firewall manager: %r\n' % self.argv) raise Fatal(e) diff --git a/sshuttle/helpers.py b/sshuttle/helpers.py index 4a41e4e..6c8ab82 100644 --- a/sshuttle/helpers.py +++ b/sshuttle/helpers.py @@ -5,16 +5,11 @@ import errno logprefix = '' verbose = 0 -if sys.version_info[0] == 3: - binary_type = bytes +binary_type = bytes - def b(s): - return s.encode("ASCII") -else: - binary_type = str - def b(s): - return s +def b(s): + return s.encode("ASCII") def log(s): 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: |