mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-28 22:25:10 +02:00
[options] Fix file based configurations for python 2 (Closes #5401)
This commit is contained in:
parent
9933857f67
commit
b04b94da5f
@ -794,21 +794,22 @@ def parseOpts(overrideArguments=None):
|
||||
if opts.verbose:
|
||||
write_string('[debug] Override config: ' + repr(overrideArguments) + '\n')
|
||||
else:
|
||||
command_line_conf = sys.argv[1:]
|
||||
# Workaround for Python 2.x, where argv is a byte list
|
||||
if sys.version_info < (3,):
|
||||
command_line_conf = [
|
||||
a.decode(preferredencoding(), 'replace') for a in command_line_conf]
|
||||
def compat_conf(conf):
|
||||
if sys.version_info < (3,):
|
||||
return [a.decode(preferredencoding(), 'replace') for a in conf]
|
||||
return conf
|
||||
|
||||
command_line_conf = compat_conf(sys.argv[1:])
|
||||
|
||||
if '--ignore-config' in command_line_conf:
|
||||
system_conf = []
|
||||
user_conf = []
|
||||
else:
|
||||
system_conf = _readOptions('/etc/youtube-dl.conf')
|
||||
system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf'))
|
||||
if '--ignore-config' in system_conf:
|
||||
user_conf = []
|
||||
else:
|
||||
user_conf = _readUserConf()
|
||||
user_conf = compat_conf(_readUserConf())
|
||||
argv = system_conf + user_conf + command_line_conf
|
||||
|
||||
opts, args = parser.parse_args(argv)
|
||||
|
Loading…
Reference in New Issue
Block a user