youtube-dl

commit f7e2ee8fa6a3c5ca9ae8b8d25ae489f502c6277c
parent 66dc9a3701cd97af44cf478e813d4f7eb0947edc
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sun,  1 Mar 2015 12:05:13 +0100

Merge branch 'master' of github.com:rg3/youtube-dl

Diffstat:
M
youtube_dl/YoutubeDL.py
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -4,8 +4,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import collections
+import contextlib
 import datetime
 import errno
+import fileinput
 import io
 import itertools
 import json
@@ -1452,8 +1454,11 @@ class YoutubeDL(object):
         return self._download_retcode
 
     def download_with_info_file(self, info_filename):
-        with io.open(info_filename, 'r', encoding='utf-8') as f:
-            info = json.load(f)
+        with contextlib.closing(fileinput.FileInput(
+                [info_filename], mode='r',
+                openhook=fileinput.hook_encoded('utf-8'))) as f:
+            # FileInput doesn't have a read method, we can't call json.load
+            info = json.loads('\n'.join(f))
         try:
             self.process_ie_result(info, download=True)
         except DownloadError: