]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
More Youku Python 3 fixing
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 15 Dec 2012 16:59:09 +0000 (17:59 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 15 Dec 2012 16:59:09 +0000 (17:59 +0100)
youtube_dl/InfoExtractors.py

index fd977d2d99878228137cab321fd81321cdbdaa69..b1ede697a7bedd5260072450f57a8939988c8e28 100644 (file)
@@ -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