From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 1 Aug 2008 01:36:47 +0000 (+0000)
Subject: Remove use of tuple unpacking and dict.has_key() so as to silence
X-Git-Tag: v2.6b3~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6a30ecf7aa02665b11028a1ee25497bcebd8136;p=thirdparty%2FPython%2Fcpython.git

Remove use of tuple unpacking and dict.has_key() so as to silence
SyntaxWarning as triggered by -3.
---

diff --git a/Lib/bdb.py b/Lib/bdb.py
index 74870e3f5157..d74415bf1477 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -131,8 +131,7 @@ class Bdb:
         raise NotImplementedError, "subclass of bdb must implement do_clear()"
 
     def break_anywhere(self, frame):
-        return self.breaks.has_key(
-            self.canonic(frame.f_code.co_filename))
+        return self.canonic(frame.f_code.co_filename) in self.breaks
 
     # Derived classes should override the user_* methods
     # to gain control.
@@ -150,7 +149,8 @@ class Bdb:
         """This method is called when a return trap is set here."""
         pass
 
-    def user_exception(self, frame, (exc_type, exc_value, exc_traceback)):
+    def user_exception(self, frame, exc_info):
+        exc_type, exc_value, exc_traceback = exc_info
         """This method is called if an exception occurs,
         but only if we are to stop at or just below this level."""
         pass
diff --git a/Lib/pdb.py b/Lib/pdb.py
index 86162025f847..a7a3a18befaf 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -175,7 +175,8 @@ class Pdb(bdb.Bdb, cmd.Cmd):
         print >>self.stdout, '--Return--'
         self.interaction(frame, None)
 
-    def user_exception(self, frame, (exc_type, exc_value, exc_traceback)):
+    def user_exception(self, frame, exc_info):
+        exc_type, exc_value, exc_traceback = exc_info
         """This function is called if an exception occurs,
         but only if we are to stop at or just below this level."""
         frame.f_locals['__exception__'] = exc_type, exc_value