R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[YoutubeDL] Use the same proxy as the default one if the alternative one not specified

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-02-27 20:51:43 +08:00
parent 9c10fed4db
commit 9dadd38c22
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/YoutubeDL.py
View File

@ -1731,8 +1731,14 @@ class YoutubeDL(object):
latest_version) latest_version)
def _setup_openers(self): def _setup_openers(self):
self._setup_single_opener('default', self.params.get('proxy')) default_proxy = self.params.get('proxy')
self._setup_single_opener('alternative', self.params.get('alternative_proxy')) alternative_proxy = self.params.get('alternative_proxy')
if not alternative_proxy:
alternative_proxy = default_proxy
self._setup_single_opener('default', default_proxy)
self._setup_single_opener('alternative', alternative_proxy)
self.use_opener('default') self.use_opener('default')
def _setup_single_opener(self, opener_name, opts_proxy): def _setup_single_opener(self, opener_name, opts_proxy):