From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 7 Jul 2016 17:40:58 +0000 (+0200)
Subject: [options] Do not decode Unicode on Python 2.x
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=30d22dae8e39237244798a8c3fa93df11edd2548

[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)
---

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)