diff options
| author | Allan Zhou <allanzp@gmail.com> | 2013-09-03 12:22:29 -0700 |
|---|---|---|
| committer | Allan Zhou <allanzp@gmail.com> | 2013-09-03 12:22:29 -0700 |
| commit | c3dd69eab40d1e006962a8a2b2ebc2dce94e1aec (patch) | |
| tree | 84f78a6ca94748b1ea91679d5e5da6e830cd2844 /youtube_dl/extractor/metacafe.py | |
| parent | 85f03346ebe38c0b4cd46ab64bf9b5825d12895a (diff) | |
| parent | c8dbccde30d9ca06d4c9305329a9aacd10420276 (diff) | |
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 { |