summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-12-03 13:11:20 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-12-03 13:11:20 +0100
commita0eaa341e1ce6254179c1a00a11704da1887e124 (patch)
tree7910b29e6931f50838ae192dce3205fdf2497743
parentfb27c2295e0e9d6f2f6ac45ed5906987b4710d0a (diff)
downloadyoutube-dl-a0eaa341e1ce6254179c1a00a11704da1887e124.tar.gz
youtube-dl-a0eaa341e1ce6254179c1a00a11704da1887e124.tar.xz
youtube-dl-a0eaa341e1ce6254179c1a00a11704da1887e124.zip
[configuration] Undo code breakage
-rw-r--r--youtube_dl/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 9c8a694f0..fff295e8c 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -87,7 +87,9 @@ def parseOpts(overrideArguments=None):
         except IOError:
             return default  # silently skip if file is not present
         try:
-            res = [shlex.split(l, comments=True) for l in optionf]
+            res = []
+            for l in optionf:
+                res += shlex.split(l, comments=True)
         finally:
             optionf.close()
         return res