From 8f2f22ad2757d126da9c728749ee3679310c3a54 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 24 Aug 2008 20:59:23 +0000
Subject: Fix gdbinit to handle new types/APIs.

---
 Misc/NEWS    | 5 +++++
 Misc/gdbinit | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index cf9b8dd..b846d8f 100644
--- 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 96f3439..1eff6db 100644
--- 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
-- 
cgit v0.12