commit 30d22dae8e39237244798a8c3fa93df11edd2548
parent 571808a7aa50fbc14c7e9db5569167bd19beac9d
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 7 Jul 2016 19:40:58 +0200
[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)
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
@@ -812,11 +812,11 @@ def parseOpts(overrideArguments=None):
system_conf = []
user_conf = []
else:
- system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf'))
+ system_conf = _readOptions('/etc/youtube-dl.conf')
if '--ignore-config' in system_conf:
user_conf = []
else:
- user_conf = compat_conf(_readUserConf())
+ user_conf = _readUserConf()
argv = system_conf + user_conf + command_line_conf
opts, args = parser.parse_args(argv)