浏览代码

[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)
Philipp Hagemeister 9 年之前
父节点
当前提交
30d22dae8e
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      youtube_dl/options.py

+ 2 - 2
youtube_dl/options.py

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