New upstream version 1.30.7.upstream/1.30.7

1 files changed, 10 insertions, 5 deletions

diff --git a/gallery_dl/util.py b/gallery_dl/util.py
index 45ffc9c..7b9ce99 100644
--- a/gallery_dl/util.py
+++ b/gallery_dl/util.py
@@ -987,16 +987,21 @@ def build_proxy_map(proxies, log=None):
     if isinstance(proxies, str):
         if "://" not in proxies:
             proxies = "http://" + proxies.lstrip("/")
-        return {"http": proxies, "https": proxies}
-
-    if isinstance(proxies, dict):
+        proxies = {"http": proxies, "https": proxies}
+    elif isinstance(proxies, dict):
         for scheme, proxy in proxies.items():
             if "://" not in proxy:
                 proxies[scheme] = "http://" + proxy.lstrip("/")
-        return proxies
+    else:
+        proxies = None
 
     if log is not None:
-        log.warning("invalid proxy specifier: %s", proxies)
+        if proxies is None:
+            log.warning("Invalid proxy specifier: %r", proxies)
+        else:
+            log.debug("Proxy Map: %s", proxies)
+
+    return proxies
 
 
 def build_predicate(predicates):