Add support for Python 3.
* NEWS: Mention Python 3 support. * varobj.c (value_get_print_value): Use python_string_to_target_string. * python/py-block.c: Use PyVarObject_HEAD_INIT in initialization of type objects. * python/py-breakpoint.c: Ditto. * python/py-cmd.c: Ditto. * python/py-event.c: Ditto. * python/py-event.h: Ditto. * python/py-evtregistry.c: Ditto. * python/py-finishbreakpoint.c: Ditto. * python/py-frame.c: Ditto. * python/py-function.c: Ditto. * python/py-infthread.c: Ditto. * python/py-lazy-string.c: Ditto. * python/py-progspace.c: Ditto. * /python/py-symbol.c: Ditto. * python/py-evts.c: (gdbpy_initialize_py_events): Add module initialization for Python 3. * python/py-inferior.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (infpy_read_memory): Return memoryview object if Python 3. (infpy_write_memory): Use "s*" operand parsing code for Python 3. (infpy_search_memory): Ditto. (get_buffer): New function for Python 3. * python/py-objfile.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (objfpy_dealloc): Use Py_TYPE to call tp_free. * python/py-param.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (get_attr): Use PyUnicode_CompareWithASCIIString if Python 3. (set_attr): Ditto. * python/py-prettyprint.c (print_string_repr): use PyBytes methods instead of PyString methods if Python 3. (print_children): Skip push_dummy_python_frame call if Python 3. * python/py-symtab.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (salpy_dealloc): Use Py_TYPE to call tp_free. * python/py-type.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (field_dealloc): Use Py_TYPE to call tp_free. (typy_dealloc): Ditto. (type_object_as_number): Adjust struct initializations for differences in layout for Python 2 vs. Python 3. * python/py-utils.c (python_string_to_unicode): Omit non-Unicode string case for Python 3. (unicode_to_encoded_python_string): Shorten code (no functional change). (python_string_to_target_python_string): Comment that in Python 3 returned value is a Python "bytes" type. (gdbpy_is_string): Omit non-Unicode string check in Python 3. (gdb_py_object_from_longest): Omit non-long integer case in Python 3. (gdb_py_object_from_ulongest): Ditto. * python/py-value.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (valpy_dealloc): Use Py_TYPE to call tp_free. (valpy_int): Omit function if Python 3. (convert_value_from_python): Use "%S" format (Python object as a string) if Python 3. (value_object_as_number): Adjust struct initializations for differences in layout for Python 2 vs. Python 3. * python/python-config.py: Adjust syntax for Python 3 compatibility. Include "sys.abiflags" string as part of python library name, if that attribute exists (Python 3). * python/python-internal.h (IS_PY3): Define if Python 3. (Py_TPFLAGS_HAVE_ITER, Py_TPFLAGS_CHECKTYPES): Define with placeholder value if Python 3. (PyInt_Check, PyInt_FromLong, PyInt_AsLong, PyString_FromString, PyString_Decode, PyString_FromFormat, PyString_Check): Define as analogous Python 3 API function if Python 3. (PyVarObject_HEAD_INIT): Define if not already defined. (Py_TYPE): Ditto. * python/python.c (eval_python_command): Omit Py_FlushLine call if Python 3. Check return values of all Python API calls for error. Supply dummy "python" and "python-interactive" commands if Python initialization failed. (_initialize_python): Convert argc to wchar_t** if Python 3. Add module initialization for Python 3. (finish_python_initialization): Pass wchar_t * argument to PySys_SetPath if Python 3. * python/lib/gdb/__init__.py: Define "reload" if Python 3. (_GdbFile): New class for common output file behavior. (GdbOutFile): Subclass from _GdbFile. (GdbOutputErrorFile): Ditto. (auto_load_packages): Adjust syntax for Python 3 compatibility. * python/lib/gdb/printing.py: Define basestr and int if Python 3. * python/lib/gdb/prompt.py: Use sorted() function rather than sort() method. * python/lib/gdb/command/explore.py: Define raw_input if Python 3. Adjust syntax for Python 3 compatibility. * python/lib/gdb/command/pretty_printers.py: Use sorted() function rather than sort() method. Adjust syntax for Python 3 compatibility. * python/lib/gdb/command/type_printers.py: Ditto. * doc/gdb.texinfo (Inferior.read_memory): Mention that the return value is a memoryview object if Python 3.
This commit is contained in:
parent
b8b98ad1fc
commit
9a27f2c60d
35 changed files with 530 additions and 172 deletions
|
@ -348,8 +348,13 @@ print_string_repr (PyObject *printer, const char *hint,
|
|||
struct type *type;
|
||||
|
||||
make_cleanup_py_decref (string);
|
||||
#ifdef IS_PY3K
|
||||
output = (gdb_byte *) PyBytes_AS_STRING (string);
|
||||
length = PyBytes_GET_SIZE (string);
|
||||
#else
|
||||
output = PyString_AsString (string);
|
||||
length = PyString_Size (string);
|
||||
#endif
|
||||
type = builtin_type (gdbarch)->builtin_char;
|
||||
|
||||
if (hint && !strcmp (hint, "string"))
|
||||
|
@ -383,6 +388,7 @@ print_string_repr (PyObject *printer, const char *hint,
|
|||
return result;
|
||||
}
|
||||
|
||||
#ifndef IS_PY3K
|
||||
static void
|
||||
py_restore_tstate (void *p)
|
||||
{
|
||||
|
@ -458,6 +464,7 @@ push_dummy_python_frame (void)
|
|||
make_cleanup (py_restore_tstate, frame->f_back);
|
||||
return (PyObject *) frame;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Helper for apply_val_pretty_printer that formats children of the
|
||||
printer, if any exist. If is_py_none is true, then nothing has
|
||||
|
@ -471,7 +478,10 @@ print_children (PyObject *printer, const char *hint,
|
|||
{
|
||||
int is_map, is_array, done_flag, pretty;
|
||||
unsigned int i;
|
||||
PyObject *children, *iter, *frame;
|
||||
PyObject *children, *iter;
|
||||
#ifndef IS_PY3K
|
||||
PyObject *frame;
|
||||
#endif
|
||||
struct cleanup *cleanups;
|
||||
|
||||
if (! PyObject_HasAttr (printer, gdbpy_children_cst))
|
||||
|
@ -515,6 +525,7 @@ print_children (PyObject *printer, const char *hint,
|
|||
/* Manufacture a dummy Python frame to work around Python 2.4 bug,
|
||||
where it insists on having a non-NULL tstate->frame when
|
||||
a generator is called. */
|
||||
#ifndef IS_PY3K
|
||||
frame = push_dummy_python_frame ();
|
||||
if (!frame)
|
||||
{
|
||||
|
@ -522,6 +533,7 @@ print_children (PyObject *printer, const char *hint,
|
|||
goto done;
|
||||
}
|
||||
make_cleanup_py_decref (frame);
|
||||
#endif
|
||||
|
||||
done_flag = 0;
|
||||
for (i = 0; i < options->print_max; ++i)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue