projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into bliptv
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index fba99af8dce2143e7cc8feba3a61460f2b029839..9a8c7da05172e342959d2ec5ffa481ab951fa763 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-28,6
+28,7
@@
if os.name == 'nt':
import ctypes
from .compat import (
import ctypes
from .compat import (
+ compat_basestring,
compat_cookiejar,
compat_expanduser,
compat_get_terminal_size,
compat_cookiejar,
compat_expanduser,
compat_get_terminal_size,
@@
-63,6
+64,7
@@
from .utils import (
SameFileError,
sanitize_filename,
sanitize_path,
SameFileError,
sanitize_filename,
sanitize_path,
+ sanitized_Request,
std_headers,
subtitles_filename,
UnavailableVideoError,
std_headers,
subtitles_filename,
UnavailableVideoError,
@@
-1187,7
+1189,7
@@
class YoutubeDL(object):
return res
def _calc_cookies(self, info_dict):
return res
def _calc_cookies(self, info_dict):
- pr =
compat_urllib_request.
Request(info_dict['url'])
+ pr =
sanitized_
Request(info_dict['url'])
self.cookiejar.add_cookie_header(pr)
return pr.get_header('Cookie')
self.cookiejar.add_cookie_header(pr)
return pr.get_header('Cookie')
@@
-1871,6
+1873,8
@@
class YoutubeDL(object):
def urlopen(self, req):
""" Start an HTTP download """
def urlopen(self, req):
""" Start an HTTP download """
+ if isinstance(req, compat_basestring):
+ req = sanitized_Request(req)
return self._opener.open(req, timeout=self._socket_timeout)
def print_debug_header(self):
return self._opener.open(req, timeout=self._socket_timeout)
def print_debug_header(self):