Merge tag 'upstream/2014.11.21'

[youtubedl] / youtube_dl / extractor / wimp.py

diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index 3377a543ee7a93d59cd139389bb1c4c35b687277..d6dec25ca9e7bb9de539e89c147e22b7381e3719 100644 (file)
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -37,7 +37,7 @@ class WimpIE(InfoExtractor):
         video_id = mobj.group(1)
         webpage = self._download_webpage(url, video_id)
         video_url = self._search_regex(
         video_id = mobj.group(1)
         webpage = self._download_webpage(url, video_id)
         video_url = self._search_regex(

-            r"'file'\s*:\s*'([^']+)'", webpage, 'video URL')
+            r"[\"']file[\"']\s*[:,]\s*[\"'](.+?)[\"']", webpage, 'video URL')

         if YoutubeIE.suitable(video_url):
             self.to_screen('Found YouTube video')
             return {
         if YoutubeIE.suitable(video_url):
             self.to_screen('Found YouTube video')
             return {