Browse Source

More Youku Python 3 fixing

Philipp Hagemeister 12 years ago
parent
commit
8f6f40d991
1 changed files with 3 additions and 2 deletions
  1. 3 2
      youtube_dl/InfoExtractors.py

+ 3 - 2
youtube_dl/InfoExtractors.py

@@ -3349,7 +3349,8 @@ class YoukuIE(InfoExtractor):
 
 
         self.report_extraction(video_id)
         self.report_extraction(video_id)
         try:
         try:
-            config = json.loads(jsondata)
+            jsonstr = jsondata.decode('utf-8')
+            config = json.loads(jsonstr)
 
 
             video_title =  config['data'][0]['title']
             video_title =  config['data'][0]['title']
             seed = config['data'][0]['seed']
             seed = config['data'][0]['seed']
@@ -3373,7 +3374,7 @@ class YoukuIE(InfoExtractor):
 
 
             fileid = config['data'][0]['streamfileids'][format]
             fileid = config['data'][0]['streamfileids'][format]
             keys = [s['k'] for s in config['data'][0]['segs'][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')
             self._downloader.trouble(u'ERROR: unable to extract info section')
             return
             return