From: remitamine Date: Fri, 4 Sep 2015 20:12:13 +0000 (+0100) Subject: [downloader/external] change _argless_option function to _valueless_option X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=dc534b674f9dfbe869d23f6a64ea48f39bde6655;p=youtube-dl [downloader/external] change _argless_option function to _valueless_option --- diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index cae8f6f0f..056215f8c 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -47,7 +47,7 @@ class ExternalFD(FileDownloader): def _option(self, command_option, param): param = self.params.get(param) - if param is None or param is False: + if param is None: return [] return [command_option, param] @@ -59,7 +59,7 @@ class ExternalFD(FileDownloader): return [command_option + separator + (true_value if param else false_value)] return [command_option, true_value if param else false_value] - def _argless_option(self, command_option, param, expected_value=True): + def _valueless_option(self, command_option, param, expected_value=True): param = self.params.get(param) return [command_option] if param == expected_value else [] @@ -91,7 +91,7 @@ class CurlFD(ExternalFD): cmd += ['--header', '%s: %s' % (key, val)] cmd += self._option('--interface', 'source_address') cmd += self._option('--proxy', 'proxy') - cmd += self._argless_option('--insecure', 'nocheckcertificate') + cmd += self._valueless_option('--insecure', 'nocheckcertificate') cmd += self._configuration_args() cmd += ['--', info_dict['url']] return cmd @@ -114,7 +114,7 @@ class WgetFD(ExternalFD): cmd += ['--header', '%s: %s' % (key, val)] cmd += self._option('--bind-address', 'source_address') cmd += self._option('--proxy', 'proxy') - cmd += self._argless_option('--no-check-certificate', 'nocheckcertificate') + cmd += self._valueless_option('--no-check-certificate', 'nocheckcertificate') cmd += self._configuration_args() cmd += ['--', info_dict['url']] return cmd