diff options
| author | Pierre Rudloff <contact@rudloff.pro> | 2013-09-03 01:27:49 +0200 |
|---|---|---|
| committer | Pierre Rudloff <contact@rudloff.pro> | 2013-09-03 01:27:49 +0200 |
| commit | b0446d6a33ed3b5789e57c83904f1d7cf1a85d19 (patch) | |
| tree | 70a69d7e9bad6a9f2d131b908d0a13b416fed704 /youtube_dl/extractor/metacafe.py | |
| parent | 847f582290c6ad6ec0c72760ea3cfa6417d28e3c (diff) | |
| parent | 8e4e89f1c236e1bec38c5363c1c341930056211e (diff) | |
| download | youtube-dl-b0446d6a33ed3b5789e57c83904f1d7cf1a85d19.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/metacafe.py')
| -rw-r--r-- | youtube_dl/extractor/metacafe.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py index e38dc98b4..e537648ff 100644 --- a/youtube_dl/extractor/metacafe.py +++ b/youtube_dl/extractor/metacafe.py @@ -122,7 +122,7 @@ class MetacafeIE(InfoExtractor): video_title = self._html_search_regex(r'(?im)<title>(.*) - Video</title>', webpage, u'title') description = self._og_search_description(webpage) video_uploader = self._html_search_regex( - r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("channel","([^"]+)"\);', + r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("(?:channel|submiter)","([^"]+)"\);', webpage, u'uploader nickname', fatal=False) return { |