]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Fix the printing of the proxy map in debug mode
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 7 Oct 2013 19:10:31 +0000 (21:10 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 7 Oct 2013 19:10:31 +0000 (21:10 +0200)
The proxies have to be extracted from the opener.handlers

youtube_dl/__init__.py

index 9594fd892465292456e5227c96db7a871561b421..3ff78daace47149ca35a36d76eaa0bf929ba5e25 100644 (file)
@@ -448,7 +448,7 @@ def _real_main(argv=None):
     all_urls = batchurls + args
     all_urls = [url.strip() for url in all_urls]
 
-    _setup_opener(jar=jar, opts=opts)
+    opener = _setup_opener(jar=jar, opts=opts)
 
     extractors = gen_extractors()
 
@@ -641,7 +641,12 @@ def _real_main(argv=None):
             except:
                 pass
         write_string(u'[debug] Python version %s - %s' %(platform.python_version(), platform_name()) + u'\n')
-        write_string(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n')
+
+        proxy_map = {}
+        for handler in opener.handlers:
+            if hasattr(handler, 'proxies'):
+                proxy_map.update(handler.proxies)
+        write_string(u'[debug] Proxy map: ' + compat_str(proxy_map) + u'\n')
 
     ydl.add_default_info_extractors()