MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-30 19:02:55 +01:00
Code Issues Releases Wiki Activity

[options] Fix file based configurations for python 2 (Closes #5401)

Browse Source
This commit is contained in:
Sergey M․ 2015-04-12 03:57:56 +06:00
parent 9933857f67
commit b04b94da5f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/options.py
View File

@ -794,21 +794,22 @@ def parseOpts(overrideArguments=None):
if opts.verbose: if opts.verbose:
write_string('[debug] Override config: ' + repr(overrideArguments) + '\n') write_string('[debug] Override config: ' + repr(overrideArguments) + '\n')
else: else:
command_line_conf = sys.argv[1:] def compat_conf(conf):
# Workaround for Python 2.x, where argv is a byte list if sys.version_info < (3,):
if sys.version_info < (3,): return [a.decode(preferredencoding(), 'replace') for a in conf]
command_line_conf = [ return conf
a.decode(preferredencoding(), 'replace') for a in command_line_conf]
command_line_conf = compat_conf(sys.argv[1:])
if '--ignore-config' in command_line_conf: if '--ignore-config' in command_line_conf:
system_conf = [] system_conf = []
user_conf = [] user_conf = []
else: else:
system_conf = _readOptions('/etc/youtube-dl.conf') system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf'))
if '--ignore-config' in system_conf: if '--ignore-config' in system_conf:
user_conf = [] user_conf = []
else: else:
user_conf = _readUserConf() user_conf = compat_conf(_readUserConf())
argv = system_conf + user_conf + command_line_conf argv = system_conf + user_conf + command_line_conf
opts, args = parser.parse_args(argv) opts, args = parser.parse_args(argv)