From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 9 Jun 2013 21:43:18 +0000 (+0200)
Subject: Allow unsetting the proxy with the --proxy option
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=53f72b11e58a22674476b8695eca13516d11f3eb;p=youtube-dl

Allow unsetting the proxy with the --proxy option
---

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 308c48fe6..9279ce776 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -392,8 +392,11 @@ def _real_main(argv=None):
 
     # General configuration
     cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
-    if opts.proxy:
-        proxies = {'http': opts.proxy, 'https': opts.proxy}
+    if opts.proxy is not None:
+        if opts.proxy == '':
+            proxies = {}
+        else:
+            proxies = {'http': opts.proxy, 'https': opts.proxy}
     else:
         proxies = compat_urllib_request.getproxies()
         # Set HTTPS proxy to HTTP one if given (https://github.com/rg3/youtube-dl/issues/805)