X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=5df965191c373614c3f62128ece2b65d53fb8f72;hb=56bd028a0f4b3809403d887012bb93bbc06296a5;hp=7a0466077ae1e37682707ec0c29a753741769c85;hpb=e2eca6f65e9969c31b3374bd3688321f3e471cd7;p=youtube-dl

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 7a0466077..5df965191 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -67,9 +67,9 @@ def _real_main(argv=None):
     # Custom HTTP headers
     if opts.headers is not None:
         for h in opts.headers:
-            if h.find(':', 1) < 0:
+            if ':' not in h:
                 parser.error('wrong header formatting, it should be key:value, not "%s"' % h)
-            key, value = h.split(':', 2)
+            key, value = h.split(':', 1)
             if opts.verbose:
                 write_string('[debug] Adding header from command line option %s:%s\n' % (key, value))
             std_headers[key] = value
@@ -406,7 +406,7 @@ def _real_main(argv=None):
 
         try:
             if opts.load_info_filename is not None:
-                retcode = ydl.download_with_info_file(opts.load_info_filename)
+                retcode = ydl.download_with_info_file(compat_expanduser(opts.load_info_filename))
             else:
                 retcode = ydl.download(all_urls)
         except MaxDownloadsReached: