Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-04 08:12:59 +08:00
Code Issues Releases Wiki Activity

Fixed unintended merge differences

Browse Source
This commit is contained in:
Cliff Avey 2016-07-20 22:47:46 -04:00
parent 5d4be274ee
commit a7619048f0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/options.py
View File

@ -26,9 +26,11 @@ def parseOpts(overrideArguments=None, overrideIgnoreConfig=True):
except IOError: except IOError:
return default # silently skip if file is not present return default # silently skip if file is not present
try: try:
res = [] # FIXME: https://github.com/rg3/youtube-dl/commit/dfe5fa49aed02cf36ba9f743b11b0903554b5e56
for l in optionf: contents = optionf.read()
res += compat_shlex_split(l, comments=True) if sys.version_info < (3,):
contents = contents.decode(preferredencoding())
res = compat_shlex_split(contents, comments=True)
finally: finally:
optionf.close() optionf.close()
return res return res