[3/3] gdb/python: drop support for Python < 3.4

Message ID 20220107152921.2858909-3-simon.marchi@polymtl.ca
State New
Headers show
Series
  • [1/3] gdb/python: remove Python 2 support
Related show

Commit Message

Simon Marchi via Gdb-patches Jan. 7, 2022, 3:29 p.m.
Python 3 versions <= 3.3 are quite old and not likely to be used
nowadays.  Dropping support for them allows us to remove some hacks and
compatibility macros that depend on the Python version being < 3.4.

Change the documentation to state the Python 3 versions we support.

We could go even further and document that we only support versions 3.5
or 3.6 and up, for example, but that wouldn't change the code.  So we
might as well document the older Python 3 version we can support without
special hacks.

[1] https://www.python.org/dev/peps/pep-0478/
[2] https://www.python.org/dev/peps/pep-0494/

Change-Id: I608610dced678c93e2bd338a91662d1c706df511
---
 gdb/doc/python.texi                            |  2 +-
 gdb/python/lib/gdb/__init__.py                 |  8 +-------
 gdb/python/py-gdb-readline.c                   |  7 +------
 gdb/python/python-internal.h                   | 11 -----------
 gdb/testsuite/gdb.perf/lib/perftest/measure.py |  6 ------
 5 files changed, 3 insertions(+), 31 deletions(-)

-- 
2.34.1

Comments

Simon Marchi via Gdb-patches Jan. 7, 2022, 4:33 p.m. | #1
> Date: Fri,  7 Jan 2022 10:29:21 -0500

> From: Simon Marchi via Gdb-patches <gdb-patches@sourceware.org>

> 

> Python 3 versions <= 3.3 are quite old and not likely to be used

> nowadays.  Dropping support for them allows us to remove some hacks and

> compatibility macros that depend on the Python version being < 3.4.


Are there real reasons to drop those old versions?  I mean, does
supporting them causes us some real maintenance burden?

> We could go even further and document that we only support versions 3.5

> or 3.6 and up, for example, but that wouldn't change the code.


That'd mean dropping support for Windows XP, as AFAIU 3.4 is the last
one which supports it.
Simon Marchi via Gdb-patches Jan. 7, 2022, 5:14 p.m. | #2
On 2022-01-07 11:33, Eli Zaretskii wrote:
>> Date: Fri,  7 Jan 2022 10:29:21 -0500

>> From: Simon Marchi via Gdb-patches <gdb-patches@sourceware.org>

>>

>> Python 3 versions <= 3.3 are quite old and not likely to be used

>> nowadays.  Dropping support for them allows us to remove some hacks and

>> compatibility macros that depend on the Python version being < 3.4.

> 

> Are there real reasons to drop those old versions?  I mean, does

> supporting them causes us some real maintenance burden?


Not on the same level as supporting Python 2 does, no.  It's just on the
basis that these versions are long gone, in my experience.

I'll withdraw this patch, since keeping support for these old versions
isn't much of a burden.

Simon

Patch

diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
index 6e89aae02bd3..889888c4a459 100644
--- a/gdb/doc/python.texi
+++ b/gdb/doc/python.texi
@@ -18,7 +18,7 @@ 
 You can extend @value{GDBN} using the @uref{http://www.python.org/,
 Python programming language}.  This feature is available only if
 @value{GDBN} was configured using @option{--with-python}.
-@value{GDBN} can be built against Python 3.
+@value{GDBN} can be built against Python 3, versions 3.4 and above.
 
 @cindex python directory
 Python scripts used by @value{GDBN} should be installed in
diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py
index 0c04a72f7819..4c939da6d400 100644
--- a/gdb/python/lib/gdb/__init__.py
+++ b/gdb/python/lib/gdb/__init__.py
@@ -17,13 +17,7 @@  import traceback
 import os
 import sys
 import _gdb
-
-# Python 3 moved "reload"
-if sys.version_info >= (3, 4):
-    from importlib import reload
-else:
-    from imp import reload
-
+from importlib import reload
 from _gdb import *
 
 
diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
index af388d5ed72e..ee243d15412a 100644
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -29,12 +29,7 @@ 
    command_line_input is used instead.  */
 
 static char *
-gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
-#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4
-			const char *prompt)
-#else
-			char *prompt)
-#endif
+gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout, const char *prompt)
 {
   int n;
   const char *p = NULL;
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index b38d69258add..1137b1da56fe 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -121,17 +121,6 @@  typedef unsigned long gdb_py_ulongest;
 
 #endif /* HAVE_LONG_LONG */
 
-#if PY_VERSION_HEX < 0x03020000
-typedef long Py_hash_t;
-#endif
-
-/* PyMem_RawMalloc appeared in Python 3.4.  For earlier versions, we can just
-   fall back to PyMem_Malloc.  */
-
-#if PY_VERSION_HEX < 0x03040000
-#define PyMem_RawMalloc PyMem_Malloc
-#endif
-
 /* PyObject_CallMethod's 'method' and 'format' parameters were missing
    the 'const' qualifier before Python 3.4.  Hence, we wrap the
    function in our own version to avoid errors with string literals.
diff --git a/gdb/testsuite/gdb.perf/lib/perftest/measure.py b/gdb/testsuite/gdb.perf/lib/perftest/measure.py
index 88fd6c87e52f..514687d0ec69 100644
--- a/gdb/testsuite/gdb.perf/lib/perftest/measure.py
+++ b/gdb/testsuite/gdb.perf/lib/perftest/measure.py
@@ -18,12 +18,6 @@  import os
 import gc
 import sys
 
-# time.perf_counter() and time.process_time() were added in Python
-# 3.3, time.clock() was removed in Python 3.8.
-if sys.version_info < (3, 3, 0):
-    time.perf_counter = time.clock
-    time.process_time = time.clock
-
 
 class Measure(object):
     """A class that measure and collect the interesting data for a given testcase.