From patchwork Fri Sep 15 09:40:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 1834799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Z2ScPCee; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rn8NL5Bdtz1yhZ for ; Fri, 15 Sep 2023 19:41:54 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A166F3855594 for ; Fri, 15 Sep 2023 09:41:52 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 9B9F43858C52 for ; Fri, 15 Sep 2023 09:41:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B9F43858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694770870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g0VXYF3pajDLbcXWO2V59KAW7sNfcPxk8sN4/jPfvys=; b=Z2ScPCee0UKIDeMATPIyFfVjs5IqC0T925WU2ZG5rUrRHRVS0I8KFx1AM2UmeQXsBWrw1y V7th+IVtD+1lh9Nfc+CC+b1+T4x2h78TRik5zg4WbwmvWKRtaNBkDWW3DEeasu1TNlQC7R N4VQbYmw0jKLFMCMITRmamchnPTmReY= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-47-Tk-Jf4dQMSunBN6ySyT7-Q-1; Fri, 15 Sep 2023 05:41:08 -0400 X-MC-Unique: Tk-Jf4dQMSunBN6ySyT7-Q-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-52a06f5f4e2so1349900a12.2 for ; Fri, 15 Sep 2023 02:41:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694770867; x=1695375667; 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=g0VXYF3pajDLbcXWO2V59KAW7sNfcPxk8sN4/jPfvys=; b=kVsxZoLOqgbJrR++TgnoIz5MDcH7nViKH5rxKukUG5QnQvdFXhTHXktfWKmaXEAMYq FtMZxJv8N5YluqAHWktv286SJRShhxY6fK8piuKfYV2inH0882x2e81Ao8eCYkIuNx7H PWRiFqhOEv89SZQY9o45vioNjAcBewWwiIQ5dRbx20HF0I33Ifn4FshJFkSw/01eQI3C 8lAqqImNaTUzjhwiQepPLArH9HtHewul/+ssxMzbhue9Goosmd2LTqBfy92C2hPTHfjE 3KEj8dv4y/X6bUBxSs9CYXRyVDT3qirbokbzn8qC5CuI/EmneaUJwxruyUUXTJt+RHBT LQJw== X-Gm-Message-State: AOJu0YwKUGiDWbFx3tN+qgLtsJbDVXmkNdKW+wKtC3E5YMGhXNgdyrqg bYRX9TN5Goi9n8i+7fJrTCfY5SEji1RMlkj0DZsCu3m63JFYwyxbwn6/MbHTKNoG7S+Xp77It5T T3X5IuiH+jvRae6UuWbbiTmRBPQQ= X-Received: by 2002:a50:ee0d:0:b0:52a:6497:d02b with SMTP id g13-20020a50ee0d000000b0052a6497d02bmr929765eds.16.1694770866974; Fri, 15 Sep 2023 02:41:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH2tzlQ07R1MKXzUpSR11LpReX+/Xqb8EHdjSloZVbHUOkKaSQ4vnErBIvvLShs0zMdma60bg== X-Received: by 2002:a50:ee0d:0:b0:52a:6497:d02b with SMTP id g13-20020a50ee0d000000b0052a6497d02bmr929754eds.16.1694770866643; Fri, 15 Sep 2023 02:41:06 -0700 (PDT) Received: from hathi.site (p57b61769.dip0.t-ipconnect.de. [87.182.23.105]) by smtp.gmail.com with ESMTPSA id h25-20020aa7c619000000b0052fdc837d93sm2019915edq.47.2023.09.15.02.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 02:41:06 -0700 (PDT) Received: by hathi.site (Postfix, from userid 10030) id B660D84B58; Fri, 15 Sep 2023 11:41:05 +0200 (CEST) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: Mike FABIAN Subject: [PATCH 2/3] localedata/unicode-gen/utf8_gen.py: adapt regexp to get relevant lines from EastAsianWidth.txt Date: Fri, 15 Sep 2023 11:40:24 +0200 Message-ID: <20230915094038.1178807-2-mfabian@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230915094038.1178807-1-mfabian@redhat.com> References: <20230915094038.1178807-1-mfabian@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org --- localedata/unicode-gen/utf8_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Carlos O'Donell diff --git a/localedata/unicode-gen/utf8_gen.py b/localedata/unicode-gen/utf8_gen.py index b48dc2aaa4..117c5a9652 100755 --- a/localedata/unicode-gen/utf8_gen.py +++ b/localedata/unicode-gen/utf8_gen.py @@ -350,7 +350,7 @@ if __name__ == "__main__": # the EastAsianWidth.txt file. if re.match(r'.*\.\..*', LINE): continue - if re.match(r'^[^;]*;[WF]', LINE): + if re.match(r'^[^;]*;\s*[WF]\s*', LINE): EAST_ASIAN_WIDTH_LINES.append(LINE.strip()) with open(ARGS.prop_list_file, mode='r') as PROP_LIST_FILE: PROP_LIST_LINES = []