commit: 1251565ee0efd71f98d77f1eeefe3f3e38ec6f43
parent 1f7258a367bfcc0d60441e38d25373a6ada6b45e
Author: Sergey M․ <dstftw@gmail.com>
Date: Sat, 9 Jul 2016 07:12:52 +0700
[options] Rollback old behavior for configuratio files' encoding
Until agreed with some solution
Diffstat:
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git 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