diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-13 12:24:42 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-13 12:35:45 +0100 |
| commit | 1cc79574fc5df21bf35dccf61eac0e9e75ed8d20 (patch) | |
| tree | 5cc2bd2a2faba0ac5e8371892e3ef09ab5338080 /youtube_dl/extractor/moniker.py | |
| parent | 20e35880bf7413c5085c1ade96af0fc6e56d84d1 (diff) | |
| download | youtube-dl-1cc79574fc5df21bf35dccf61eac0e9e75ed8d20.tar.xz | |
Fix imports and general cleanup
· Import from compat what comes from compat. Yes, some names are available in utils too, but that's an implementation detail.
· Use _match_id consistently whenever possible
· Fix some outdated tests
· Use consistent valid URL (always match the whole protocol, no ^ at start required)
· Use modern test definitions
Diffstat (limited to 'youtube_dl/extractor/moniker.py')
| -rw-r--r-- | youtube_dl/extractor/moniker.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/youtube_dl/extractor/moniker.py b/youtube_dl/extractor/moniker.py index 1c4f589cc..5de719bdc 100644 --- a/youtube_dl/extractor/moniker.py +++ b/youtube_dl/extractor/moniker.py @@ -5,7 +5,7 @@ import os.path import re from .common import InfoExtractor -from ..utils import ( +from ..compat import ( compat_urllib_parse, compat_urllib_request, ) @@ -37,10 +37,9 @@ class MonikerIE(InfoExtractor): }] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - + video_id = self._match_id(url) orig_webpage = self._download_webpage(url, video_id) + fields = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', orig_webpage) data = dict(fields) |