Assert that the proxies object passed in to the URLopener constructor

is indeed a dictionary (or a mapping).

diff --git a/Lib/urllib.py b/Lib/urllib.py
index a818adfd58dd175d6c2e3c74f9f81d0901e28c1e..02edb3b265aa5bbd3b2ac4c7bea09cc33448bb23 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -87,6 +87,7 @@ class URLopener:
        def __init__(self, proxies=None):
                if proxies is None:
                        proxies = getproxies()
+               assert hasattr(proxies, 'has_key'), "proxies must be a mapping"
                self.proxies = proxies
                server_version = "Python-urllib/%s" % __version__
                self.addheaders = [('User-agent', server_version)]