From: Bruno Larsen <blarsen@redhat.com>
To: Tom Tromey <tromey@adacore.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] Remove some Python 2 code
Date: Wed, 28 Jun 2023 15:43:35 +0200 [thread overview]
Message-ID: <ee228f81-e464-0f60-4bae-942b9efaa81f@redhat.com> (raw)
In-Reply-To: <20230613185312.824860-1-tromey@adacore.com>
On 13/06/2023 20:53, Tom Tromey via Gdb-patches wrote:
> I found some Python 2 compatibility code in gdb's Python library.
> There's no need for this any more, so this removes it. There is still
> a bit more of this remaining in __init__.py, but I haven't tried
> removing that yet.
> ---
Nice cleanup, and a long time coming IMO. Reviewed-By: Bruno Larsen
<blarsen@redhat.com>
--
Cheers,
Bruno
> gdb/python/lib/gdb/FrameIterator.py | 8 +-------
> gdb/python/lib/gdb/frames.py | 8 ++------
> 2 files changed, 3 insertions(+), 13 deletions(-)
>
> diff --git a/gdb/python/lib/gdb/FrameIterator.py b/gdb/python/lib/gdb/FrameIterator.py
> index 190ec942814..2cae7b59a0f 100644
> --- a/gdb/python/lib/gdb/FrameIterator.py
> +++ b/gdb/python/lib/gdb/FrameIterator.py
> @@ -30,7 +30,7 @@ class FrameIterator(object):
> def __iter__(self):
> return self
>
> - def next(self):
> + def __next__(self):
> """next implementation.
>
> Returns:
> @@ -41,9 +41,3 @@ class FrameIterator(object):
> raise StopIteration
> self.frame = result.older()
> return result
> -
> - # Python 3.x requires __next__(self) while Python 2.x requires
> - # next(self). Define next(self), and for Python 3.x create this
> - # wrapper.
> - def __next__(self):
> - return self.next()
> diff --git a/gdb/python/lib/gdb/frames.py b/gdb/python/lib/gdb/frames.py
> index 5f8119c22a0..0287a9bf3d3 100644
> --- a/gdb/python/lib/gdb/frames.py
> +++ b/gdb/python/lib/gdb/frames.py
> @@ -190,12 +190,8 @@ def execute_frame_filters(frame, frame_low, frame_high):
> frame_iterator = FrameIterator(frame)
>
> # Apply a basic frame decorator to all gdb.Frames. This unifies
> - # the interface. Python 3.x moved the itertools.imap
> - # functionality to map(), so check if it is available.
> - if hasattr(itertools, "imap"):
> - frame_iterator = itertools.imap(FrameDecorator, frame_iterator)
> - else:
> - frame_iterator = map(FrameDecorator, frame_iterator)
> + # the interface.
> + frame_iterator = map(FrameDecorator, frame_iterator)
>
> for ff in sorted_list:
> frame_iterator = ff.filter(frame_iterator)
prev parent reply other threads:[~2023-06-28 13:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 18:53 Tom Tromey
2023-06-28 13:43 ` Bruno Larsen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ee228f81-e464-0f60-4bae-942b9efaa81f@redhat.com \
--to=blarsen@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=tromey@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).