From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by sourceware.org (Postfix) with ESMTPS id CF2B93858423 for ; Wed, 4 Oct 2023 15:10:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CF2B93858423 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-xd34.google.com with SMTP id ca18e2360f4ac-79545e141c7so32003139f.0 for ; Wed, 04 Oct 2023 08:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1696432215; x=1697037015; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nSq2f3aUbyS9y+n+FDskNRX6A2iyZoHHFyig81Bb3wE=; b=U/1VUc4qFNGry9LiTcL0b38Seuquisnc4Xf3Gpu5Effid3sZ78AsyZNI1fwt5qIWkQ N+ENlazlAI6nULtghinSpZT7Bkrgd2XM3MXqIfDug6bSrS/j252yjBCJoop7ziD4+jPR Mr8X4XWzBdiriOV+DkzPAPgmo1eAabHLSazrMVk8vPrT7hagXUvfFvIRjSFQNLwkG6gq ESXsnX8VuwBda++Y0JZtmuUDBtj7VyZ62oB0lTXhn+xqVgD8ZSDPIyoh//i7o2yPPD2M wt2SILrLp7jojChb47+zr0leQT44HeFqFbs7/hPnJJKJaCQN2Eks27i+ezd2Bx9Ja6C0 9z/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696432215; x=1697037015; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nSq2f3aUbyS9y+n+FDskNRX6A2iyZoHHFyig81Bb3wE=; b=c8++PYy1PYw7FvdqQFIxEQK0Zk/eCTF7GNA/dd8vtcLq6nK0v+IyuyruLEXarJ7wq6 lpt79O//ZMWS1lN6KiHiM0KIuuAxgXbMcpD7LXRFOilfYmmomCwIjuK36I18H0Lt2jky 4iWjMLnoTlKQFeP9jdYh2mBn0lux8wI7yzYn3qV6SSOEv4VpH6BAEC4fUX9J/1BH9ZM0 II38xo454bfjNCkymvAoKiGaJKhYWteuunqCPY94bDNfrj2YHmPjJ0DyO2C2d/OoJJj/ py7kuhGQK+Sv9v0yxzccA0JE6bOhH+5HCdmNkKELENQwvfZqvNiRBHOfz9X0Zr3Oyvkg pVqg== X-Gm-Message-State: AOJu0Yzn0/h+4WaF748zs3+xutvttzjd1HJKve2xCeWoP8O4hNh27HrW 3k0Nkks/kE93qRf0JxiynXc2FQ== X-Google-Smtp-Source: AGHT+IFcKTxmnw5i3XQbKYpY2tZ/fZ0e0bYJw/l9c95UKOKmQUU0zJhNOkRXDxe7Sl5kFSa+J/80Dw== X-Received: by 2002:a05:6602:2c4c:b0:79f:e800:ea95 with SMTP id x12-20020a0566022c4c00b0079fe800ea95mr5779853iov.3.1696432214984; Wed, 04 Oct 2023 08:10:14 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id u23-20020a6be417000000b007870289f4fdsm1000980iog.51.2023.10.04.08.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 08:10:14 -0700 (PDT) From: Tom Tromey To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Tom Tromey Subject: [PATCH] libstdc++: Correctly call _string_types function Date: Wed, 4 Oct 2023 09:10:05 -0600 Message-Id: <20231004151005.1676194-1-tromey@adacore.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 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=ham 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 points out that the new call to _string_types from StdExpAnyPrinter.__init__ is not correct -- it needs to be qualified. libstdc++-v3/ChangeLog: * python/libstdcxx/v6/printers.py (StdExpAnyPrinter.__init__): Qualify call to _string_types. --- libstdc++-v3/python/libstdcxx/v6/printers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 23efbd171ec..9a51f26d8e0 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -1386,7 +1386,7 @@ class StdExpAnyPrinter(SingleObjContainerPrinter): # FIXME need to expand 'std::string' so that gdb.lookup_type works if 'std::string' in mgrname: mgrtypes = [] - for s in _string_types(): + for s in StdExpAnyPrinter._string_types(): try: x = re.sub(r"std::string(?!\w)", s, m.group(1)) # The following lookup might raise gdb.error if the -- 2.40.1