From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id 8DC363870C26 for ; Thu, 28 Sep 2023 17:46:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8DC363870C26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-79fc3d32a2fso312807039f.1 for ; Thu, 28 Sep 2023 10:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1695923206; x=1696528006; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nzCDTUskecfdSBaQy086LaR/2B/dhPGAP8Vlr2wmgn4=; b=UhiNLQo4u7rfN2gkIZV6t0cAhImmLWLxYMRlZUsHSKpR5X+nqn3J/cxPIFSk+1Tbci HQjkegFfCq5ryUktxkwnjiPmpEq/ITIns7C7PffjAW+uePDat6IVDw0WX7975anhTkQB XueuPKfySJM7QsFQ9+hrMMxyNy3CHwk7czYqCVv9eNyDWww1OJ8CXNbil0BtXrHb6gNN +01yLpNTeWWtI758nIIkOF6j0RaHHWU3qAI7c/aQQx5t9+OfTm2Q8g5Hx9pPxWrh5Wxx pecnHdn6CtMw9k96gsXCA0eEYQMzqOqfiqNSbIzKVgU8sRNXmiwf6ih4olr1rsxIMuUT CVwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695923206; x=1696528006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nzCDTUskecfdSBaQy086LaR/2B/dhPGAP8Vlr2wmgn4=; b=tN7T4P3yUqB3MRcN10w2XBTeW/N+Imawh4h6274tWf/ghUfMdL1tdKKGsBX7bV0hSU D0S97Yz22MRhoYKEt+lgLfCuas0c00inuMx2HNEfR37iulnsszlxclhfoDXPRqdanIzW XVUKxOevwMX/tlxgYwiVGSMnG82DBjO60q70MPF7Xfk+dEfDufigKgpIythOzckvOppq gVceiTbPirX4Kpq2zmx9YIS/v91V340fDiZtLPt6eFFHqrvo9jpXOHfKg6LEWxIy/IX6 /codyCH2PGYTsKhpn5mVkrd0WbTpnXZrVxc5MdjxbbANpqITju8RlKn6XvPP7IMFraO9 jg5Q== X-Gm-Message-State: AOJu0YyG2umUQcSmywiMml1NATX0duwmvHDJWLnM88NEVY4H3q4/2eEx NW+WvhvKluQ0NB+vkLR6HinK7YNapZDUIKG98tFEsw== X-Google-Smtp-Source: AGHT+IG1/a3YdM2EAm8w4j/AjMCOGhihlFULYejkkZJFHQ2c3tTAsnSszieK2Z5o46PFZZyalBiZDg== X-Received: by 2002:a05:6e02:1787:b0:349:3503:253b with SMTP id y7-20020a056e02178700b003493503253bmr2313015ilu.17.1695923205804; Thu, 28 Sep 2023 10:46:45 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id p6-20020a92d486000000b0034fc8c1c24fsm3450963ilg.54.2023.09.28.10.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 10:46:45 -0700 (PDT) From: Tom Tromey To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Tom Tromey 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> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230928174630.4004388-1-tromey@adacore.com> References: <20230928174630.4004388-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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(-) 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