From: Tom de Vries <tdevries@suse.de>
Date: Sat, 14 Dec 2024 08:36:37 +0000 (+0100)
Subject: [gdb/dap] Fix regressions with python 3.6
X-Git-Tag: gdb-16-branchpoint~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff601fb3041a566d492d2704b3fcba92a1b026a;p=thirdparty%2Fbinutils-gdb.git

[gdb/dap] Fix regressions with python 3.6

With test-case gdb.dap/ada-arrays.exp, on Leap openSUSE 15.6 with python 3.6,
I run into:
...
Python Exception <class 'TypeError'>: 'type' object is not subscriptable
Error occurred in Python: 'type' object is not subscriptable
ERROR: tcl error sourcing ada-arrays.exp.
...

This is due to using a python 3.9 construct:
...
thread_ids: dict[int, int] = {}
...

Fix this by using typing.Dict instead.

Tested on x86_64-linux.
---

diff --git a/gdb/python/lib/gdb/dap/frames.py b/gdb/python/lib/gdb/dap/frames.py
index 12113961386..5ef6cdaeaa8 100644
--- a/gdb/python/lib/gdb/dap/frames.py
+++ b/gdb/python/lib/gdb/dap/frames.py
@@ -20,6 +20,7 @@ from gdb.frames import frame_iterator
 
 from .startup import in_gdb_thread
 from .state import set_thread
+from typing import Dict
 
 # A list of all the frames we've reported.  A frame's index in the
 # list is its ID.  We don't use a hash here because frames are not
@@ -31,7 +32,7 @@ _all_frames = []
 _iter_map = {}
 
 # Map from a global frame ID to a thread ID.
-thread_ids: dict[int, int] = {}
+thread_ids: Dict[int, int] = {}
 
 
 # Clear all the frame IDs.