Bläddra i källkod

Allow unsetting the proxy with the --proxy option

Philipp Hagemeister 12 år sedan
förälder
incheckning
53f72b11e5
1 ändrade filer med 5 tillägg och 2 borttagningar
  1. 5 2
      youtube_dl/__init__.py

+ 5 - 2
youtube_dl/__init__.py

@@ -392,8 +392,11 @@ def _real_main(argv=None):
 
 
     # General configuration
     # General configuration
     cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
     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:
     else:
         proxies = compat_urllib_request.getproxies()
         proxies = compat_urllib_request.getproxies()
         # Set HTTPS proxy to HTTP one if given (https://github.com/rg3/youtube-dl/issues/805)
         # Set HTTPS proxy to HTTP one if given (https://github.com/rg3/youtube-dl/issues/805)