Merge branch 'pr-democracynow' of https://github.com/atomicdryad/youtube-dl into...

[youtube-dl] / youtube_dl / extractor / youku.py

diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py
index 6219bc1bb915ca17117c34fe7e7c98e915e2cfee..2e81d92238307e8914769d6fc48d03befd6af2bf 100644 (file)
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dl/extractor/youku.py
@@ -54,9 +54,9 @@ class YoukuIE(InfoExtractor):
         'note': 'Video protected with password',
         'info_dict': {
             'id': 'XNjA1NzA2Njgw',
-            'ext': 'flv',
-            'title': u'邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起',
+            'title': '邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起',
         },
+        'playlist_count': 19,
         'params': {
             'videopassword': '100600',
         },
@@ -201,7 +201,7 @@ class YoukuIE(InfoExtractor):
         # request basic data
         basic_data_url = 'http://v.youku.com/player/getPlayList/VideoIDS/%s' % video_id
         if video_password:
-            basic_data_url = '%s?password=%s' % (basic_data_url, video_password)
+            basic_data_url += '?password=%s' % video_password
 
         data1 = retrieve_data(
             basic_data_url,