diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-12-23 20:20:46 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@efficios.com> | 2022-03-23 07:41:19 -0400 |
commit | edae3fd6600f10f9e16dc017b705959f541ed19a (patch) | |
tree | 0e8b6288c02dec48f369594a9032dcac20146e33 /gdb/python/python-internal.h | |
parent | e52a16f2aa20773f42c28bf91a568d0683e5767c (diff) | |
download | gdb-edae3fd6600f10f9e16dc017b705959f541ed19a.zip gdb-edae3fd6600f10f9e16dc017b705959f541ed19a.tar.gz gdb-edae3fd6600f10f9e16dc017b705959f541ed19a.tar.bz2 |
gdb/python: remove Python 2 support
New in this version:
- Add a PY_MAJOR_VERSION check in configure.ac / AC_TRY_LIBPYTHON. If
the user passes --with-python=python2, this will cause a configure
failure saying that GDB only supports Python 3.
Support for Python 2 is a maintenance burden for any patches touching
Python support. Among others, the differences between Python 2 and 3
string and integer types are subtle. It requires a lot of effort and
thinking to get something that behaves correctly on both. And that's if
the author and reviewer of the patch even remember to test with Python
2.
See this thread for an example:
https://sourceware.org/pipermail/gdb-patches/2021-December/184260.html
So, remove Python 2 support. Update the documentation to state that GDB
can be built against Python 3 (as opposed to Python 2 or 3).
Update all the spots that use:
- sys.version_info
- IS_PY3K
- PY_MAJOR_VERSION
- gdb_py_is_py3k
... to only keep the Python 3 portions and drop the use of some
now-removed compatibility macros.
I did not update the configure script more than just removing the
explicit references to Python 2. We could maybe do more there, like
check the Python version and reject it if that version is not
supported. Otherwise (with this patch), things will only fail at
compile time, so it won't really be clear to the user that they are
trying to use an unsupported Python version. But I'm a bit lost in the
configure code that checks for Python, so I kept that for later.
Change-Id: I75b0f79c148afbe3c07ac664cfa9cade052c0c62
Diffstat (limited to 'gdb/python/python-internal.h')
-rw-r--r-- | gdb/python/python-internal.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 7d1e425..ccf440c 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -87,11 +87,6 @@ #include <frameobject.h> #include "py-ref.h" -#if PY_MAJOR_VERSION >= 3 -#define IS_PY3K 1 -#endif - -#ifdef IS_PY3K #define Py_TPFLAGS_CHECKTYPES 0 #define PyInt_Check PyLong_Check @@ -102,7 +97,6 @@ #define PyString_Decode PyUnicode_Decode #define PyString_FromFormat PyUnicode_FromFormat #define PyString_Check PyUnicode_Check -#endif /* If Python.h does not define WITH_THREAD, then the various GIL-related functions will not be defined. However, @@ -209,11 +203,7 @@ gdb_PySys_GetObject (const char *name) before Python 3.6. Hence, we wrap it in a function to avoid errors when compiled with -Werror. */ -#ifdef IS_PY3K # define GDB_PYSYS_SETPATH_CHAR wchar_t -#else -# define GDB_PYSYS_SETPATH_CHAR char -#endif static inline void gdb_PySys_SetPath (const GDB_PYSYS_SETPATH_CHAR *path) |