From: Sergey M․ Date: Sat, 9 Jul 2016 00:12:52 +0000 (+0700) Subject: [options] Rollback old behavior for configuratio files' encoding X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=1251565ee0efd71f98d77f1eeefe3f3e38ec6f43;p=youtube-dl [options] Rollback old behavior for configuratio files' encoding Until agreed with some solution --- diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 5302b67cc..c4a85b2c0 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -26,7 +26,11 @@ def parseOpts(overrideArguments=None): except IOError: return default # silently skip if file is not present try: - res = compat_shlex_split(optionf.read(), comments=True) + # FIXME: https://github.com/rg3/youtube-dl/commit/dfe5fa49aed02cf36ba9f743b11b0903554b5e56 + contents = optionf.read() + if sys.version_info < (3,): + contents = contents.decode(preferredencoding()) + res = compat_shlex_split(contents, comments=True) finally: optionf.close() return res