From: Mariatta <Mariatta@users.noreply.github.com>
Date: Tue, 7 Mar 2017 10:44:11 +0000 (-0800)
Subject: Fixes bpo-29680: Older gdb does not have gdb.error. (GH-363) (GH-534)
X-Git-Tag: v3.6.2rc1~348
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23b26c4e206427a9e0a1d39240c17a049cf8c732;p=thirdparty%2FPython%2Fcpython.git

Fixes bpo-29680: Older gdb does not have gdb.error. (GH-363) (GH-534)

This change is required to make python-dbg.py compatible with GDB versions before 7.3.
(cherry picked from commit 661ca8843fed1183e38db06e52d59ac300bf1c2a)
---

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index cc1afbe16d01..d28851f9fd7f 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -714,7 +714,7 @@ class PyDictObjectPtr(PyObjectPtr):
         try:
             # <= Python 3.5
             return keys['dk_entries'], dk_size
-        except gdb.error:
+        except RuntimeError:
             # >= Python 3.6
             pass