diff options
| author | remitamine <remitamine@gmail.com> | 2015-12-03 20:05:11 +0100 | 
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-12-03 20:05:11 +0100 | 
| commit | 640bb54e73779f4a941eae1f17e4be049ca575db (patch) | |
| tree | ba0c50db3ad5bb0932a56cda66d4f386b145bb22 /youtube_dl/extractor/smotri.py | |
| parent | 497f5fd93fe1efd0df8dc58d518c328ed1409457 (diff) | |
| parent | e0977d7686e5df524b1a024484e7a4bb9cfa261d (diff) | |
Merge branch 'master' of https://github.com/rg3/youtube-dl into bilibili
Diffstat (limited to 'youtube_dl/extractor/smotri.py')
| -rw-r--r-- | youtube_dl/extractor/smotri.py | 10 | 
1 files changed, 4 insertions, 6 deletions
| diff --git a/youtube_dl/extractor/smotri.py b/youtube_dl/extractor/smotri.py index 35a81ee87..30210c8a3 100644 --- a/youtube_dl/extractor/smotri.py +++ b/youtube_dl/extractor/smotri.py @@ -7,13 +7,11 @@ import hashlib  import uuid  from .common import InfoExtractor -from ..compat import ( -    compat_urllib_parse, -    compat_urllib_request, -) +from ..compat import compat_urllib_parse  from ..utils import (      ExtractorError,      int_or_none, +    sanitized_Request,      unified_strdate,  ) @@ -176,7 +174,7 @@ class SmotriIE(InfoExtractor):          if video_password:              video_form['pass'] = hashlib.md5(video_password.encode('utf-8')).hexdigest() -        request = compat_urllib_request.Request( +        request = sanitized_Request(              'http://smotri.com/video/view/url/bot/', compat_urllib_parse.urlencode(video_form))          request.add_header('Content-Type', 'application/x-www-form-urlencoded') @@ -339,7 +337,7 @@ class SmotriBroadcastIE(InfoExtractor):                  'password': password,              } -            request = compat_urllib_request.Request( +            request = sanitized_Request(                  broadcast_url + '/?no_redirect=1', compat_urllib_parse.urlencode(login_form))              request.add_header('Content-Type', 'application/x-www-form-urlencoded')              broadcast_page = self._download_webpage( | 
