diff mbox series

[7/7] libstdc++: Use Python "not in" operator

Message ID	20230928174630.4004388-8-tromey@adacore.com
State	Unresolved
Headers	Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 880C43870C0A From: Tom Tromey <tromey@adacore.com> To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Tom Tromey <tromey@adacore.com> Subject: [PATCH 7/7] libstdc++: Use Python "not in" operator Date: Thu, 28 Sep 2023 11:46:30 -0600 Message-Id: <20230928174630.4004388-8-tromey@adacore.com> In-Reply-To: <20230928174630.4004388-1-tromey@adacore.com> References: <20230928174630.4004388-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX
Series	libstdc++: Use gdb.ValuePrinter in pretty-printers \| [0/7] libstdc++: Use gdb.ValuePrinter in pretty-printers [1/7] libstdc++: Show full Python stack on error [2/7] libstdc++: Use gdb.ValuePrinter base class [3/7] libstdc++: Remove unused Python imports [4/7] libstdc++: Remove unused locals from printers.py [5/7] libstdc++: Remove std_ratio_t_tuple [6/7] libstdc++: Fix regex escapes in pretty-printers [7/7] libstdc++: Use Python "not in" operator

Checks

Context	Check	Description
snail/gcc-patch-check	warning	Git am fail log

Commit Message

Tom Tromey Sept. 28, 2023, 5:46 p.m. UTC

  flake8 warns about code like

    not something in "whatever"

Ordinarily in Python this should be written as:

    something not in "whatever"

This patch makes this change.

libstdc++-v3/ChangeLog:

        * python/libstdcxx/v6/printers.py (Printer.add_version)
	(add_one_template_type_printer)
	(FilteringTypePrinter.add_one_type_printer): Use Python
	"not in" operator.
---
 libstdc++-v3/python/libstdcxx/v6/printers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jonathan Wakely Sept. 28, 2023, 6:52 p.m. UTC | #1

On Thu, 28 Sept 2023, 18:54 Tom Tromey via Libstdc++, <libstdc++@gcc.gnu.org>
wrote:

> flake8 warns about code like
>
>     not something in "whatever"
>
> Ordinarily in Python this should be written as:
>
>     something not in "whatever"
>
> This patch makes this change.
>

OK, thanks.



> libstdc++-v3/ChangeLog:
>
>         * python/libstdcxx/v6/printers.py (Printer.add_version)
>         (add_one_template_type_printer)
>         (FilteringTypePrinter.add_one_type_printer): Use Python
>         "not in" operator.
> ---
>  libstdc++-v3/python/libstdcxx/v6/printers.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py
> b/libstdc++-v3/python/libstdcxx/v6/printers.py
> index d125236b777..380426cd41e 100644
> --- a/libstdc++-v3/python/libstdcxx/v6/printers.py
> +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
> @@ -2321,7 +2321,7 @@ class Printer(object):
>      # Add a name using _GLIBCXX_BEGIN_NAMESPACE_VERSION.
>      def add_version(self, base, name, function):
>          self.add(base + name, function)
> -        if _versioned_namespace and not '__cxx11' in base:
> +        if _versioned_namespace and '__cxx11' not in base:
>              vbase = re.sub('^(std|__gnu_cxx)::', r'\g<0>%s' %
>                             _versioned_namespace, base)
>              self.add(vbase + name, function)
> @@ -2494,7 +2494,7 @@ def add_one_template_type_printer(obj, name,
> defargs):
>      printer = TemplateTypePrinter('std::__debug::'+name, defargs)
>      gdb.types.register_type_printer(obj, printer)
>
> -    if _versioned_namespace and not '__cxx11' in name:
> +    if _versioned_namespace and '__cxx11' not in name:
>          # Add second type printer for same type in versioned namespace:
>          ns = 'std::' + _versioned_namespace
>          # PR 86112 Cannot use dict comprehension here:
> @@ -2589,7 +2589,7 @@ class FilteringTypePrinter(object):
>  def add_one_type_printer(obj, template, name, targ1=None):
>      printer = FilteringTypePrinter('std::' + template, 'std::' + name,
> targ1)
>      gdb.types.register_type_printer(obj, printer)
> -    if _versioned_namespace and not '__cxx11' in template:
> +    if _versioned_namespace and '__cxx11' not in template:
>          ns = 'std::' + _versioned_namespace
>          printer = FilteringTypePrinter(ns + template, ns + name, targ1)
>          gdb.types.register_type_printer(obj, printer)
> --
> 2.40.1
>
>

diff mbox series

Patch

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index d125236b777..380426cd41e 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -2321,7 +2321,7 @@  class Printer(object):
     # Add a name using _GLIBCXX_BEGIN_NAMESPACE_VERSION.
     def add_version(self, base, name, function):
         self.add(base + name, function)
-        if _versioned_namespace and not '__cxx11' in base:
+        if _versioned_namespace and '__cxx11' not in base:
             vbase = re.sub('^(std|__gnu_cxx)::', r'\g<0>%s' %
                            _versioned_namespace, base)
             self.add(vbase + name, function)
@@ -2494,7 +2494,7 @@  def add_one_template_type_printer(obj, name, defargs):
     printer = TemplateTypePrinter('std::__debug::'+name, defargs)
     gdb.types.register_type_printer(obj, printer)
 
-    if _versioned_namespace and not '__cxx11' in name:
+    if _versioned_namespace and '__cxx11' not in name:
         # Add second type printer for same type in versioned namespace:
         ns = 'std::' + _versioned_namespace
         # PR 86112 Cannot use dict comprehension here:
@@ -2589,7 +2589,7 @@  class FilteringTypePrinter(object):
 def add_one_type_printer(obj, template, name, targ1=None):
     printer = FilteringTypePrinter('std::' + template, 'std::' + name, targ1)
     gdb.types.register_type_printer(obj, printer)
-    if _versioned_namespace and not '__cxx11' in template:
+    if _versioned_namespace and '__cxx11' not in template:
         ns = 'std::' + _versioned_namespace
         printer = FilteringTypePrinter(ns + template, ns + name, targ1)
         gdb.types.register_type_printer(obj, printer)