youtube-dl

commit 8f6f40d99180ab00c918a79641a1e5508e90c76a
parent e2a8ff24a9427b8402ee7771cc145a307811ed30
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sat, 15 Dec 2012 17:59:09 +0100

More Youku Python 3 fixing

Diffstat:
M
youtube_dl/InfoExtractors.py
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
@@ -3349,7 +3349,8 @@ class YoukuIE(InfoExtractor):
 
         self.report_extraction(video_id)
         try:
-            config = json.loads(jsondata)
+            jsonstr = jsondata.decode('utf-8')
+            config = json.loads(jsonstr)
 
             video_title =  config['data'][0]['title']
             seed = config['data'][0]['seed']
@@ -3373,7 +3374,7 @@ class YoukuIE(InfoExtractor):
 
             fileid = config['data'][0]['streamfileids'][format]
             keys = [s['k'] for s in config['data'][0]['segs'][format]]
-        except (ValueError, KeyError):
+        except (UnicodeDecodeError, ValueError, KeyError):
             self._downloader.trouble(u'ERROR: unable to extract info section')
             return