projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[downloader/http] Simplify
[youtube-dl]
/
youtube_dl
/
compat.py
diff --git
a/youtube_dl/compat.py
b/youtube_dl/compat.py
index a3a2aef53ee02a910d2357431f1c0858a5bfc15f..e4b9286c06e12d967f60b5fbcf2c691802684163 100644
(file)
--- a/
youtube_dl/compat.py
+++ b/
youtube_dl/compat.py
@@
-42,6
+42,11
@@
try:
except ImportError: # Python 2
import cookielib as compat_cookiejar
except ImportError: # Python 2
import cookielib as compat_cookiejar
+try:
+ import http.cookies as compat_cookies
+except ImportError: # Python 2
+ import Cookie as compat_cookies
+
try:
import html.entities as compat_html_entities
except ImportError: # Python 2
try:
import html.entities as compat_html_entities
except ImportError: # Python 2
@@
-79,7
+84,10
@@
try:
from urllib.parse import unquote as compat_urllib_parse_unquote
from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus
except ImportError: # Python 2
from urllib.parse import unquote as compat_urllib_parse_unquote
from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus
except ImportError: # Python 2
- # HACK: The following are the correct unquote_to_bytes and unquote
+ _asciire = (compat_urllib_parse._asciire if hasattr(compat_urllib_parse, '_asciire')
+ else re.compile('([\x00-\x7f]+)'))
+
+ # HACK: The following are the correct unquote_to_bytes, unquote and unquote_plus
# implementations from cpython 3.4.3's stdlib. Python 2's version
# is apparently broken (see https://github.com/rg3/youtube-dl/pull/6244)
# implementations from cpython 3.4.3's stdlib. Python 2's version
# is apparently broken (see https://github.com/rg3/youtube-dl/pull/6244)
@@
-124,7
+132,7
@@
except ImportError: # Python 2
encoding = 'utf-8'
if errors is None:
errors = 'replace'
encoding = 'utf-8'
if errors is None:
errors = 'replace'
- bits =
compat_urllib_parse.
_asciire.split(string)
+ bits = _asciire.split(string)
res = [bits[0]]
append = res.append
for i in range(1, len(bits), 2):
res = [bits[0]]
append = res.append
for i in range(1, len(bits), 2):
@@
-433,6
+441,7
@@
__all__ = [
'compat_basestring',
'compat_chr',
'compat_cookiejar',
'compat_basestring',
'compat_chr',
'compat_cookiejar',
+ 'compat_cookies',
'compat_expanduser',
'compat_get_terminal_size',
'compat_getenv',
'compat_expanduser',
'compat_get_terminal_size',
'compat_getenv',