From: Guido van Rossum <guido@python.org>
Date: Fri, 11 Jul 1997 20:13:10 +0000 (+0000)
Subject: Test urlparse cache with try/except instead of has_key.
X-Git-Tag: v1.5a3~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=185147f1d06dd56be7f28c4af29ae152df7f4ff5;p=python

Test urlparse cache with try/except instead of has_key.
This makes it thread-safe again.
---

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 31d853a168..aeed393a83 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -44,8 +44,10 @@ def clear_cache():
 # (e.g. netloc is a single string) and we don't expand % escapes.
 def urlparse(url, scheme = '', allow_framents = 1):
 	key = url, scheme, allow_framents
-	if _parse_cache.has_key(key):
+	try:
 	    return _parse_cache[key]
+	except KeyError:
+	    pass
 	if len(_parse_cache) >= MAX_CACHE_SIZE:	# avoid runaway growth
 	    clear_cache()
 	netloc = path = params = query = fragment = ''