diff options
| -rw-r--r-- | youtube_dl/compat.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index e32bef279..1ff42d94b 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -81,6 +81,11 @@ except ImportError: import BaseHTTPServer as compat_http_server try: + compat_str = unicode # Python 2 +except NameError: + compat_str = str + +try: from urllib.parse import unquote_to_bytes as compat_urllib_parse_unquote_to_bytes from urllib.parse import unquote as compat_urllib_parse_unquote from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus @@ -100,7 +105,7 @@ except ImportError: # Python 2 # Is it a string-like object? string.split return b'' - if isinstance(string, unicode): + if isinstance(string, compat_str): string = string.encode('utf-8') bits = string.split(b'%') if len(bits) == 1: @@ -151,11 +156,6 @@ except ImportError: # Python 2 return compat_urllib_parse_unquote(string, encoding, errors) try: - compat_str = unicode # Python 2 -except NameError: - compat_str = str - -try: compat_basestring = basestring # Python 2 except NameError: compat_basestring = str @@ -234,7 +234,7 @@ else: # Working around shlex issue with unicode strings on some python 2 # versions (see http://bugs.python.org/issue1548891) def compat_shlex_split(s, comments=False, posix=True): - if isinstance(s, unicode): + if isinstance(s, compat_str): s = s.encode('utf-8') return shlex.split(s, comments, posix) |