Merge tag 'upstream/2015.06.04.1'

[youtubedl] / youtube_dl / extractor / chilloutzone.py

diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dl/extractor/chilloutzone.py
index 02d5ba52713f27412f85989749fde91970e48e36..0206d96db4670fb29a40353839dae15911b9c6d3 100644 (file)
--- a/youtube_dl/extractor/chilloutzone.py
+++ b/youtube_dl/extractor/chilloutzone.py
@@ -42,7 +42,7 @@ class ChilloutzoneIE(InfoExtractor):
             'id': '85523671',
             'ext': 'mp4',
             'title': 'The Sunday Times - Icons',
             'id': '85523671',
             'ext': 'mp4',
             'title': 'The Sunday Times - Icons',

-            'description': 'md5:3e1c0dc6047498d6728dcdaad0891762',
+            'description': 're:(?s)^Watch the making of - makingoficons.com.{300,}',

             'uploader': 'Us',
             'uploader_id': 'usfilms',
             'upload_date': '20140131'
             'uploader': 'Us',
             'uploader_id': 'usfilms',
             'upload_date': '20140131'


@@ -57,7 +57,7 @@ class ChilloutzoneIE(InfoExtractor):
 
         base64_video_info = self._html_search_regex(
             r'var cozVidData = "(.+?)";', webpage, 'video data')
 
         base64_video_info = self._html_search_regex(
             r'var cozVidData = "(.+?)";', webpage, 'video data')

-        decoded_video_info = base64.b64decode(base64_video_info).decode("utf-8")
+        decoded_video_info = base64.b64decode(base64_video_info.encode('utf-8')).decode('utf-8')

         video_info_dict = json.loads(decoded_video_info)
 
         # get video information from dict
         video_info_dict = json.loads(decoded_video_info)
 
         # get video information from dict