From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 2 Aug 2008 03:28:42 +0000 (+0000)
Subject: Remove a dict.has_key() use to silence a warning raised under -3.
X-Git-Tag: v2.6b3~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=926779e75840b99073e47ac08e9ce8b2f520533d;p=thirdparty%2FPython%2Fcpython.git

Remove a dict.has_key() use to silence a warning raised under -3.
---

diff --git a/Lib/bsddb/dbutils.py b/Lib/bsddb/dbutils.py
index 8d2e7eff5208..02a686f5d9af 100644
--- a/Lib/bsddb/dbutils.py
+++ b/Lib/bsddb/dbutils.py
@@ -61,7 +61,7 @@ def DeadlockWrap(function, *_args, **_kwargs):
     """
     sleeptime = _deadlock_MinSleepTime
     max_retries = _kwargs.get('max_retries', -1)
-    if _kwargs.has_key('max_retries'):
+    if 'max_retries' in _kwargs:
         del _kwargs['max_retries']
     while True:
         try: