diff -r 5759e9cc3639 Misc/gdbinit
--- a/Misc/gdbinit	Thu Oct 22 03:27:57 2015 -0400
+++ b/Misc/gdbinit	Thu Oct 22 15:20:26 2015 +0100
@@ -37,7 +37,7 @@
     while $_i < f->f_code->co_nlocals
 	if f->f_localsplus + $_i != 0
 	    set $_names = co->co_varnames
-	    set $_name = _PyUnicode_AsString(PyTuple_GetItem($_names, $_i))
+	    set $_name = PyUnicode_AsUTF8(PyTuple_GetItem($_names, $_i))
 	    printf "%s:\n", $_name
             pyo f->f_localsplus[$_i]
 	end
@@ -76,8 +76,8 @@
 end
 
 define pyframe
-    set $__fn = _PyUnicode_AsString(co->co_filename)
-    set $__n = _PyUnicode_AsString(co->co_name)
+    set $__fn = PyUnicode_AsUTF8(co->co_filename)
+    set $__n = PyUnicode_AsUTF8(co->co_name)
     printf "%s (", $__fn
     lineno
     printf "): %s\n", $__n