Merge tag 'upstream/2014.12.01'

[youtubedl] / youtube_dl / extractor / cloudy.py

diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dl/extractor/cloudy.py
index 386f080d241d19b30b131d2700a25ddf8de0ecc8..abf8cc280b3d6f1aeefe8219a1fd0ea5d1224be1 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):