From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 40FAE38708CA; Mon, 13 Nov 2023 15:45:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40FAE38708CA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1699890311; bh=IA2ewSqiN+MBm9a/nH8gXKuWLBnr/XjCa2MabqVsGYI=; h=From:To:Subject:Date:From; b=Nw6ldQvLi3wut+K6hnbiiJjFiysaGj4bqnaZstyYK4UryB/pNfeK6ZteTHXeCFnVs jVVPhzlN9yRsaO976CkDmWlOwiJB88XLPGa+GpZ7GMWL/rRdVyR3d7Pjb/x/aE5gV2 J0Wg1jerpRs/thS7M/+vKSSPo4+Olnxq4aTJ9s2o= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-8058] libstdc++: Use Python "not in" operator X-Act-Checkin: gcc X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 988a013ecd60a643c671715cc0a38ffb31a6f565 X-Git-Newrev: 77bf37f9111b5d8de2101c74e7d34204a563d9af Message-Id: <20231113154511.40FAE38708CA@sourceware.org> Date: Mon, 13 Nov 2023 15:45:11 +0000 (GMT) List-Id: https://gcc.gnu.org/g:77bf37f9111b5d8de2101c74e7d34204a563d9af commit r13-8058-g77bf37f9111b5d8de2101c74e7d34204a563d9af Author: Tom Tromey Date: Wed Sep 27 09:26:01 2023 -0600 libstdc++: Use Python "not in" operator 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. (cherry picked from commit 202810947ca793b17653658e584008fb151e0937) Diff: --- 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 e530cfc0e3a..23efbd171ec 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -2355,7 +2355,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) @@ -2527,7 +2527,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: @@ -2628,7 +2628,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)