diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2016-07-07 19:40:58 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2016-07-07 19:41:00 +0200 |
| commit | 30d22dae8e39237244798a8c3fa93df11edd2548 (patch) | |
| tree | be115620da2d9aec50fd0f8502ca28938dc2829c | |
| parent | 571808a7aa50fbc14c7e9db5569167bd19beac9d (diff) | |
| download | youtube-dl-30d22dae8e39237244798a8c3fa93df11edd2548.tar.gz youtube-dl-30d22dae8e39237244798a8c3fa93df11edd2548.tar.xz youtube-dl-30d22dae8e39237244798a8c3fa93df11edd2548.zip | |
[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)
| -rw-r--r-- | youtube_dl/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py index f2e3ad7a1..5302b67cc 100644 --- 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) |