From 9dadd38c22c531f0a2af17a5b7eb724bacd21c3a Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Fri, 27 Feb 2015 20:51:43 +0800 Subject: [PATCH] [YoutubeDL] Use the same proxy as the default one if the alternative one not specified --- youtube_dl/YoutubeDL.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 2bc02f8ca..608039f6c 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1731,8 +1731,14 @@ class YoutubeDL(object): latest_version) def _setup_openers(self): - self._setup_single_opener('default', self.params.get('proxy')) - self._setup_single_opener('alternative', self.params.get('alternative_proxy')) + default_proxy = self.params.get('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') def _setup_single_opener(self, opener_name, opts_proxy):