diff options
| author | Guido van Rossum <guido@python.org> | 2006-08-18 22:13:04 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-08-18 22:13:04 (GMT) |
| commit | e2b70bcf7401477936fba99a8bf4a1f759ecc8a3 (patch) | |
| tree | 4c9b65b7fd8c26a3d2f1b64ecd6b4c72a756b4b2 /Lib/urllib2.py | |
| parent | d2dbecb4ae9177e2e87adcb047147c6bcbf28cc1 (diff) | |
| download | cpython-e2b70bcf7401477936fba99a8bf4a1f759ecc8a3.zip cpython-e2b70bcf7401477936fba99a8bf4a1f759ecc8a3.tar.gz cpython-e2b70bcf7401477936fba99a8bf4a1f759ecc8a3.tar.bz2 | |
Get rid of dict.has_key(). Boy this has a lot of repercussions!
Not all code has been fixed yet; this is just a checkpoint...
The C API still has PyDict_HasKey() and _HasKeyString(); not sure
if I want to change those just yet.
Diffstat (limited to 'Lib/urllib2.py')
| -rw-r--r-- | Lib/urllib2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 6ee9e2c..93cadd7 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -660,7 +660,7 @@ class ProxyHandler(BaseHandler): def __init__(self, proxies=None): if proxies is None: proxies = getproxies() - assert hasattr(proxies, 'has_key'), "proxies must be a mapping" + assert hasattr(proxies, 'keys'), "proxies must be a mapping" self.proxies = proxies for type, url in proxies.items(): setattr(self, '%s_open' % type, |