Commit bef54e77 authored by Joshua Li's avatar Joshua Li Committed by Brian May

remove ImportError based branching

parent 9bcca279
......@@ -6,24 +6,13 @@ import zlib
import imp
import subprocess as ssubprocess
import shlex
from shlex import quote
import ipaddress
# ensure backwards compatiblity with python2.7
try:
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
from urllib.parse import urlparse
import sshuttle.helpers as helpers
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):
tokens = name.split(".")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment