Merge branch 'zhangn1985-for-up' into develop (fix #906)

This commit is contained in:
Mort Yao 2016-03-14 15:23:25 +01:00
commit 2a80fb5d5b

View File

@ -33,6 +33,7 @@ class VideoExtractor():
def download_by_url(self, url, **kwargs): def download_by_url(self, url, **kwargs):
self.url = url self.url = url
self.vid= None
if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']: if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']:
set_proxy(parse_host(kwargs['extractor_proxy'])) set_proxy(parse_host(kwargs['extractor_proxy']))
@ -50,6 +51,7 @@ class VideoExtractor():
self.download(**kwargs) self.download(**kwargs)
def download_by_vid(self, vid, **kwargs): def download_by_vid(self, vid, **kwargs):
self.url = None
self.vid = vid self.vid = vid
if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']: if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']: