Merge branch 'develop' into develop

This commit is contained in:
yuderbin 2016-04-25 11:00:52 +08:00
commit 07d8ae745b

View File

@ -171,13 +171,13 @@ class Youku(VideoExtractor):
self.password_protected = True self.password_protected = True
self.password = input(log.sprint('Password: ', log.YELLOW)) self.password = input(log.sprint('Password: ', log.YELLOW))
api_url += '&pwd={}'.format(self.password) api_url += '&pwd={}'.format(self.password)
api_url12 += '&pwd={}'.format(self.password) api12_url += '&pwd={}'.format(self.password)
meta = json.loads(get_content( meta = json.loads(get_content(
api_url, api_url,
headers={'Referer': 'http://static.youku.com/'} headers={'Referer': 'http://static.youku.com/'}
)) ))
meta12 = json.loads(get_content( meta12 = json.loads(get_content(
api_url12, api12_url,
headers={'Referer': 'http://static.youku.com/'} headers={'Referer': 'http://static.youku.com/'}
)) ))
data = meta['data'] data = meta['data']