diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-07-11 11:11:09 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-07-11 11:11:09 +0200 |
| commit | 1eb867f33fe8147cc959e7d2fcc0701a0489dc29 (patch) | |
| tree | 06f46b76a075ab68706247f0cf0c550fac7171a9 | |
| parent | e93f4f7578955b2484fe1e8927a3b5dafd9d5b52 (diff) | |
| download | youtube-dl-1eb867f33fe8147cc959e7d2fcc0701a0489dc29.tar.gz youtube-dl-1eb867f33fe8147cc959e7d2fcc0701a0489dc29.tar.xz youtube-dl-1eb867f33fe8147cc959e7d2fcc0701a0489dc29.zip | |
[vimple] Simplify and PEP8
| -rw-r--r-- | youtube_dl/extractor/vimple.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/youtube_dl/extractor/vimple.py b/youtube_dl/extractor/vimple.py index 86344849a..33d370e1c 100644 --- a/youtube_dl/extractor/vimple.py +++ b/youtube_dl/extractor/vimple.py @@ -1,10 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import zlib import base64 +import re import xml.etree.ElementTree +import zlib from .common import InfoExtractor from ..utils import int_or_none @@ -38,21 +38,21 @@ class VimpleIE(InfoExtractor): }, ] - # http://jsunpack-n.googlecode.com/svn-history/r63/trunk/swf.py - def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') iframe_url = 'http://player.vimple.ru/iframe/%s' % video_id - iframe = self._download_webpage(iframe_url, video_id, note='Downloading iframe', errnote='unable to fetch iframe') - player_url = self._html_search_regex(r'"(http://player.vimple.ru/flash/.+?)"', iframe, 'player url') + iframe = self._download_webpage( + iframe_url, video_id, + note='Downloading iframe', errnote='unable to fetch iframe') + player_url = self._html_search_regex( + r'"(http://player.vimple.ru/flash/.+?)"', iframe, 'player url') - player = self._request_webpage(player_url, video_id, note='Downloading swf player').read() + player = self._request_webpage( + player_url, video_id, note='Downloading swf player').read() - # http://stackoverflow.com/a/6804758 - # http://stackoverflow.com/a/12073686 player = zlib.decompress(player[8:]) xml_pieces = re.findall(b'([a-zA-Z0-9 =+/]{500})', player) |