summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2008-08-24 20:59:23 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2008-08-24 20:59:23 (GMT)
commit8f2f22ad2757d126da9c728749ee3679310c3a54 (patch)
treec3a5743e75cc251dccb6b906b82a7db89d45840e
parent4b360c8ee1b71193d0ef9a3d2dd3fbc21a1a29df (diff)
downloadcpython-8f2f22ad2757d126da9c728749ee3679310c3a54.zip
cpython-8f2f22ad2757d126da9c728749ee3679310c3a54.tar.gz
cpython-8f2f22ad2757d126da9c728749ee3679310c3a54.tar.bz2
Fix gdbinit to handle new types/APIs.
-rw-r--r--Misc/NEWS5
-rw-r--r--Misc/gdbinit8
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