Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / extractor / cloudy.py

diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dl/extractor/cloudy.py
index 386f080d241d19b30b131d2700a25ddf8de0ecc8..0fa720ee8745cfc728b4413b41888e17787fb5db 100644 (file)
--- a/youtube_dl/extractor/cloudy.py
+++ b/youtube_dl/extractor/cloudy.py
@@ -4,14 +4,16 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
-    ExtractorError,
+from ..compat import (

     compat_parse_qs,
     compat_urllib_parse,
     compat_parse_qs,
     compat_urllib_parse,

-    remove_end,
-    HEADRequest,

     compat_HTTPError,
 )
     compat_HTTPError,
 )

+from ..utils import (
+    ExtractorError,
+    HEADRequest,
+    remove_end,
+)

 
 
 class CloudyIE(InfoExtractor):
 
 
 class CloudyIE(InfoExtractor):


@@ -103,6 +105,7 @@ class CloudyIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         file_key = self._search_regex(
         webpage = self._download_webpage(url, video_id)
 
         file_key = self._search_regex(

-            r'filekey\s*=\s*"([^"]+)"', webpage, 'file_key')
+            [r'key\s*:\s*"([^"]+)"', r'filekey\s*=\s*"([^"]+)"'],
+            webpage, 'file_key')

 
         return self._extract_video(video_host, video_id, file_key)
 
         return self._extract_video(video_host, video_id, file_key)