extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-02-16 18:32:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove ImportError based branching

Browse Source
This commit is contained in:
Joshua Li 2020-06-02 20:01:02 -07:00 committed by Brian May
parent 9bcca27965
commit bef54e778d
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sshuttle/ssh.py
View File

@ -6,24 +6,13 @@ import zlib
import imp import imp
import subprocess as ssubprocess import subprocess as ssubprocess
import shlex import shlex
from shlex import quote
import ipaddress import ipaddress
from urllib.parse import urlparse
# ensure backwards compatiblity with python2.7
try:
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
import sshuttle.helpers as helpers import sshuttle.helpers as helpers
from sshuttle.helpers import debug2 from sshuttle.helpers import debug2
try:
# Python >= 3.5
from shlex import quote
except ImportError:
# Python 2.x
from pipes import quote
def readfile(name): def readfile(name):
tokens = name.split(".") tokens = name.split(".")