diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 22:10:26 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 22:10:26 +0100 |
commit | 27f8b0994e9924724c974f46435552d401f5fc08 (patch) | |
tree | fa3ab829cc1e81a43f955ca9442ce59dfee6440b /youtube_dl/extractor/vbox7.py | |
parent | e311b6389a7582eef6f3f8ca4b41edd4efd6cd55 (diff) | |
parent | fab6d4c048f56aa1c36897396a7fb590ae415d66 (diff) |
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/vbox7.py')
-rw-r--r-- | youtube_dl/extractor/vbox7.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/vbox7.py b/youtube_dl/extractor/vbox7.py index ebd64f0f5..455b6d9da 100644 --- a/youtube_dl/extractor/vbox7.py +++ b/youtube_dl/extractor/vbox7.py @@ -30,13 +30,13 @@ class Vbox7IE(InfoExtractor): redirect_page, urlh = self._download_webpage_handle(url, video_id) new_location = self._search_regex(r'window\.location = \'(.*)\';', - redirect_page, 'redirect location') + redirect_page, 'redirect location') redirect_url = urlh.geturl() + new_location webpage = self._download_webpage(redirect_url, video_id, - 'Downloading redirect page') + 'Downloading redirect page') title = self._html_search_regex(r'<title>(.*)</title>', - webpage, 'title').split('/')[0].strip() + webpage, 'title').split('/')[0].strip() info_url = "http://vbox7.com/play/magare.do" data = compat_urllib_parse.urlencode({'as3': '1', 'vid': video_id}) |