From ea6303b4971b0959329a1ae01648b16a4f4ac154 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 1 Apr 2022 14:29:35 -0600 Subject: [PATCH] Remove more Python 2 code I found another more place that still had a workaround for Python 2. This patch removes it. --- gdb/python/lib/gdb/FrameDecorator.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gdb/python/lib/gdb/FrameDecorator.py b/gdb/python/lib/gdb/FrameDecorator.py index 46febcd5cf6..118673fc8b6 100644 --- a/gdb/python/lib/gdb/FrameDecorator.py +++ b/gdb/python/lib/gdb/FrameDecorator.py @@ -15,15 +15,6 @@ import gdb -# This small code snippet deals with problem of strings in Python 2.x -# and Python 3.x. Python 2.x has str and unicode classes which are -# sub-classes of basestring. In Python 3.x all strings are encoded -# and basestring has been removed. -try: - basestring -except NameError: - basestring = str - class FrameDecorator(object): """Basic implementation of a Frame Decorator""" @@ -252,7 +243,7 @@ class FrameVars(object): # SYM may be a string instead of a symbol in the case of # synthetic local arguments or locals. If that is the case, # always fetch. - if isinstance(sym, basestring): + if isinstance(sym, str): return True sym_type = sym.addr_class -- 2.30.2