diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-05-24 17:54:25 +0500 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-05-24 17:54:25 +0500 |
| commit | b700055ba4adf338738207d74df65fc79f8694d0 (patch) | |
| tree | 339184d6f7ae70a4a4a646a0ffb8631f93e03dcb /youtube_dl/extractor/empflix.py | |
| parent | 23905927e19280d9217ecad377ef26ea9d5793fe (diff) | |
| parent | ed5a637d62e8ede4a8cef75df4e5f341e3c667a1 (diff) | |
Merge pull request #5772 from frenchy1983/fix_tnaflix_regex
[TNAFlix] Allow dot (and more) in cat_id and display_id
Diffstat (limited to 'youtube_dl/extractor/empflix.py')
| -rw-r--r-- | youtube_dl/extractor/empflix.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/youtube_dl/extractor/empflix.py b/youtube_dl/extractor/empflix.py index 70f8efe27..0dc947c1d 100644 --- a/youtube_dl/extractor/empflix.py +++ b/youtube_dl/extractor/empflix.py @@ -10,16 +10,18 @@ class EMPFlixIE(TNAFlixIE): _DESCRIPTION_REGEX = r'name="description" value="([^"]*)"' _CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"' - _TEST = { - 'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html', - 'md5': 'b1bc15b6412d33902d6e5952035fcabc', - 'info_dict': { - 'id': '33051', - 'display_id': 'Amateur-Finger-Fuck', - 'ext': 'mp4', - 'title': 'Amateur Finger Fuck', - 'description': 'Amateur solo finger fucking.', - 'thumbnail': 're:https?://.*\.jpg$', - 'age_limit': 18, + _TESTS = [ + { + 'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html', + 'md5': 'b1bc15b6412d33902d6e5952035fcabc', + 'info_dict': { + 'id': '33051', + 'display_id': 'Amateur-Finger-Fuck', + 'ext': 'mp4', + 'title': 'Amateur Finger Fuck', + 'description': 'Amateur solo finger fucking.', + 'thumbnail': 're:https?://.*\.jpg$', + 'age_limit': 18, + } } - } + ] |