Browse Source

[options] Rollback old behavior for configuratio files' encoding

Until agreed with some solution
totalwebcasting
Sergey M․ 8 years ago
parent
commit
1251565ee0
No known key found for this signature in database GPG Key ID: 2C393E0F18A9236D
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      youtube_dl/options.py

+ 5
- 1
youtube_dl/options.py View File

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


Loading…
Cancel
Save