From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Wed, 29 Jun 2016 12:56:05 +0000 (+0200)
Subject: [options] Accept quoted string across multiple lines (#9940)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9e29ef13a378769c19ccec200aba377ad504fe8f;p=youtube-dl

[options] Accept quoted string across multiple lines (#9940)

Like:

    -f "
    bestvideo+bestaudio/
    best
    "
---

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 99ce4131f..c9033e3cb 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -26,9 +26,7 @@ def parseOpts(overrideArguments=None):
         except IOError:
             return default  # silently skip if file is not present
         try:
-            res = []
-            for l in optionf:
-                res += compat_shlex_split(l, comments=True)
+            res = compat_shlex_split(optionf.read(), comments=True)
         finally:
             optionf.close()
         return res