Fix gdbinit to handle new types/APIs.

diff --git a/Misc/NEWS b/Misc/NEWS
index cf9b8dd85d9fc0b0f9f5ab8eac4a8168e37f7c50..b846d8fb54f12d40b90928d3471a40948f07a5fe 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,11 @@ Extension Modules
 - Issue #3643: Added a few more checks to _testcapi to prevent segfaults by
   exploitation of poor argument checking.
 
+Tools/Demos
+-----------
+
+- Fix Misc/gdbinit so it works.
+
 
 What's new in Python 3.0b3?
 ===========================

diff --git a/Misc/gdbinit b/Misc/gdbinit
index 96f34399fae6166f70769f575cfed6967bf8508d..1eff6db81aa1b9b395d996a2f9114d23d6451f67 100644 (file)
--- a/Misc/gdbinit
+++ b/Misc/gdbinit
@@ -32,7 +32,7 @@ define pylocals
     while $_i < f->f_nlocals
        if f->f_localsplus + $_i != 0
            set $_names = co->co_varnames
-           set $_name = PyUnicode_AsString(PyTuple_GetItem($_names, $_i))
+           set $_name = _PyUnicode_AsString(PyTuple_GetItem($_names, $_i))
            printf "%s:\n", $_name
            # side effect of calling _PyObject_Dump is to dump the object's
            # info - assigning just prevents gdb from printing the
@@ -50,7 +50,7 @@ define lineno
     set $__co = f->f_code
     set $__lasti = f->f_lasti
     set $__sz = ((PyVarObject *)$__co->co_lnotab)->ob_size/2
-    set $__p = (unsigned char *)((PyStringObject *)$__co->co_lnotab)->ob_sval
+    set $__p = (unsigned char *)((PyBytesObject *)$__co->co_lnotab)->ob_sval
     set $__li = $__co->co_firstlineno
     set $__ad = 0
     while ($__sz-1 >= 0 && $__continue)
@@ -73,8 +73,8 @@ define pyframev
 end
 
 define pyframe
-    set $__fn = (char *)((PyStringObject *)co->co_filename)->ob_sval
-    set $__n = PyUnicode_AsString(co->co_name)
+    set $__fn = _PyUnicode_AsString(co->co_filename)
+    set $__n = _PyUnicode_AsString(co->co_name)
     printf "%s (", $__fn
     lineno
     printf "): %s\n", $__n