mirror of
https://codeberg.org/polarisfm/youtube-dl
synced 2024-12-23 06:57:54 +01:00
[options] Do not decode Unicode on Python 2.x
The configuration file contents are being returned as unicode now, so decoding them is no longer necessary. (Run python2 with -3 to see the warning before this commit)
This commit is contained in:
parent
571808a7aa
commit
30d22dae8e
@ -812,11 +812,11 @@ def parseOpts(overrideArguments=None):
|
|||||||
system_conf = []
|
system_conf = []
|
||||||
user_conf = []
|
user_conf = []
|
||||||
else:
|
else:
|
||||||
system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf'))
|
system_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 = compat_conf(_readUserConf())
|
user_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)
|
||||||
|
Loading…
Reference in New Issue
Block a user