From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on starla X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id A08D61F44D for ; Mon, 15 Apr 2024 01:24:08 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ZXfQHLg5; dkim-atps=neutral Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwB4g-0003Zl-MQ; Sun, 14 Apr 2024 21:23:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwB4e-0003ZQ-4M for bug-gnulib@gnu.org; Sun, 14 Apr 2024 21:23:56 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwB4a-0002Ur-Pq for bug-gnulib@gnu.org; Sun, 14 Apr 2024 21:23:54 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1e2232e30f4so18368255ad.2 for ; Sun, 14 Apr 2024 18:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713144231; x=1713749031; darn=gnu.org; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=N+W4E5m9HFZZXiZHFLWQ/Q2xdzHLmVQPCSpSBys1nPQ=; b=ZXfQHLg5LfMtUm48FFbHwPp3UBatTviXgWNWgyd9CFb/yY6kg9xLF7Q2JIO6UYilo7 RmPRCWKRe2HyIOhYa/jJGVv8PkqVgEdliT1D4Y78CO7UV7HWcrZbfWCvDClY/OSb5/vh 8IN+v1vQ/h8J4+f5xzyiMvHh7NT732A0w9qMvx7sKDIqThtbyByHOxpxvPFVEiOo1XNd YUavkAE/RhsL7zpJ/XdF3QE7dW5AfbL36NoDYXVKQI73AzecLU7yqVdxUc0E2BtClOhf wbIgbrp/CjqqRUD88iMt/ZcqdtInhRHstVIxmauVg3Gpov+zHPPvgsFXUp0irOoK4bUz Pltg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713144231; x=1713749031; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=N+W4E5m9HFZZXiZHFLWQ/Q2xdzHLmVQPCSpSBys1nPQ=; b=gAHidkQ6BVR6wjodGcOY7ytCnpfj+unVOGXXw1LAt4PVFM9CnmVdw9/MeF6vGsD96n EH869mPhTxu2BdkBlQmL8GlYG2viT79Nts5adX0uj70ZQmMM8Qfk1Ic5PZXLvzEzNEHU CgsWHK8X5LLZG8Mzgb3d5g0icU8XU2E1FAhNo7Crw1gx7QqrIbNENjJ+HQzIoWJ+q42c LmXFC743ZpVrb0z4Jgt6mnyQK8HRLoiIaYk9N2WVNvZ+YP3tYnGPqFOGymJHDk8uGUcN 7iuKgXMEY7uSboDl2aKXiwgkvGtZFGR3CD+nTb0yAaStjOgqtKNzpYBetHDt1SToEBuo 0pug== X-Gm-Message-State: AOJu0Yy9Q2jGtsApJ8YhFTI7dK1eT97uEtwVOISL36yPS2bYWjAFm43P A79QSeci4gy/bpPHQ2mvo3LBAiTj2k93//yaXrFbUQu6nhsGuUjMXp+yiw== X-Google-Smtp-Source: AGHT+IGx6xD6FRoBV0+rvZjSZaoqaLp0aEge28h6qMMAPqJiFF58tymx0pllbVjin66aZyXNArh+0A== X-Received: by 2002:a17:902:ed05:b0:1e0:fcf9:95e0 with SMTP id b5-20020a170902ed0500b001e0fcf995e0mr5674725pld.20.1713144230468; Sun, 14 Apr 2024 18:23:50 -0700 (PDT) Received: from [192.168.1.5] (c-73-189-213-139.hsd1.ca.comcast.net. [73.189.213.139]) by smtp.gmail.com with ESMTPSA id bg8-20020a1709028e8800b001e4344a7601sm6610866plb.42.2024.04.14.18.23.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Apr 2024 18:23:49 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------MUwY9P4pF2LxkI3SQGS35oAz" Message-ID: Date: Sun, 14 Apr 2024 18:23:48 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: bug-gnulib@gnu.org From: Collin Funk Subject: gnulib-tool.py: Remove a redundant function. Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=collin.funk1@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org This is a multi-part message in MIME format. --------------MUwY9P4pF2LxkI3SQGS35oAz Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit The GLImport class has two functions that are the same, GLImport.rewrite_old_files() and GLImport.rewrite_new_files(). The GLImport.rewrite_old_files() function does this extra step before processing the list: files = [ '%s%s' % (file, os.path.sep) for file in files ] But before appending it to the resulting list os.path.normpath() is used. Since the following is true: os.path.normpath('abc') == 'abc' os.path.normpath('abc/') == 'abc' both of these functions are the same. Therefore, we can remove GLImport.rewrite_old_files() and rename GLImport.rewrite_new_files() to GLImport.rewrite_files(). Also, I noticed we have: for src in old_files: dest = self.rewrite_files([src])[-1] old_table.append(tuple([dest, src])) This is looping over a list, creating a new list with one item, calling GLImport.rewrite_files(), which then calls sorted(set(...)) twice, and then appending the result to a list. We should be able to create a new list from that function and zip() the two together. I'll submit another patch for that since it requires some sorting changes. Collin --------------MUwY9P4pF2LxkI3SQGS35oAz Content-Type: text/x-patch; charset=UTF-8; name="0001-gnulib-tool.py-Remove-a-redundant-function.patch" Content-Disposition: attachment; filename="0001-gnulib-tool.py-Remove-a-redundant-function.patch" Content-Transfer-Encoding: base64 RnJvbSBlYzNkMmY3MGEwNmU5M2I2Y2Q3MzBkZDFmMzYyOWQ1YTZhZDM4NmZjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBDb2xsaW4gRnVuayA8Y29sbGluLmZ1bmsxQGdtYWls LmNvbT4KRGF0ZTogU3VuLCAxNCBBcHIgMjAyNCAxODowOTozOSAtMDcwMApTdWJqZWN0OiBb UEFUQ0hdIGdudWxpYi10b29sLnB5OiBSZW1vdmUgYSByZWR1bmRhbnQgZnVuY3Rpb24uCgoq IHB5Z251bGliL0dMSW1wb3J0LnB5IChHTEltcG9ydC5yZXdyaXRlX29sZF9maWxlcyk6IFJl bW92ZSBmdW5jdGlvbi4KKEdMSW1wb3J0LnJld3JpdGVfbmV3X2ZpbGVzKTogUmVuYW1lIHRv IHJld3JpdGVfZmlsZXMuCihHTEltcG9ydC5wcmVwYXJlKTogVXNlIHJld3JpdGVfZmlsZXMg aW5zdGVhZCBvZiByZXdyaXRlX29sZF9maWxlcyBhbmQKcmV3cml0ZV9uZXdfZmlsZXMuCi0t LQogQ2hhbmdlTG9nICAgICAgICAgICAgfCAgOCArKysrKysrKwogcHlnbnVsaWIvR0xJbXBv cnQucHkgfCA0NCArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggNWI3YjNhMzZmYy4u ODJjNGE1ZjgzOCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAt MSwzICsxLDExIEBACisyMDI0LTA0LTE0ICBDb2xsaW4gRnVuayAgPGNvbGxpbi5mdW5rMUBn bWFpbC5jb20+CisKKwlnbnVsaWItdG9vbC5weTogUmVtb3ZlIGEgcmVkdW5kYW50IGZ1bmN0 aW9uLgorCSogcHlnbnVsaWIvR0xJbXBvcnQucHkgKEdMSW1wb3J0LnJld3JpdGVfb2xkX2Zp bGVzKTogUmVtb3ZlIGZ1bmN0aW9uLgorCShHTEltcG9ydC5yZXdyaXRlX25ld19maWxlcyk6 IFJlbmFtZSB0byByZXdyaXRlX2ZpbGVzLgorCShHTEltcG9ydC5wcmVwYXJlKTogVXNlIHJl d3JpdGVfZmlsZXMgaW5zdGVhZCBvZiByZXdyaXRlX29sZF9maWxlcyBhbmQKKwlyZXdyaXRl X25ld19maWxlcy4KKwogMjAyNC0wNC0xNCAgQ29sbGluIEZ1bmsgIDxjb2xsaW4uZnVuazFA Z21haWwuY29tPgogCiAJZ251bGliLXRvb2wucHk6IEZpeCBpbmNvcnJlY3QgdHlwZSBoaW50 LgpkaWZmIC0tZ2l0IGEvcHlnbnVsaWIvR0xJbXBvcnQucHkgYi9weWdudWxpYi9HTEltcG9y dC5weQppbmRleCBjNmE0NjkzYzkwLi40MzA2OTFlZmJkIDEwMDY0NAotLS0gYS9weWdudWxp Yi9HTEltcG9ydC5weQorKysgYi9weWdudWxpYi9HTEltcG9ydC5weQpAQCAtMzE0LDQ1ICsz MTQsNyBAQCBkZWYgX19yZXByX18oc2VsZikgLT4gc3RyOgogICAgICAgICByZXN1bHQgPSAn PHB5Z251bGliLkdMSW1wb3J0ICVzPicgJSBoZXgoaWQoc2VsZikpCiAgICAgICAgIHJldHVy biByZXN1bHQKIAotICAgIGRlZiByZXdyaXRlX29sZF9maWxlcyhzZWxmLCBmaWxlczogbGlz dFtzdHJdKSAtPiBsaXN0W3N0cl06Ci0gICAgICAgICcnJ1JlcGxhY2UgYXV4ZGlyLCBkb2Ni YXNlLCBzb3VyY2ViYXNlLCBtNGJhc2UgYW5kIHRlc3RzYmFzZSBmcm9tIGRlZmF1bHQKLSAg ICAgICAgdG8gdGhlaXIgdmVyc2lvbiBmcm9tIGNhY2hlZCBjb25maWcuJycnCi0gICAgICAg IGlmIHR5cGUoZmlsZXMpIGlzIG5vdCBsaXN0OgotICAgICAgICAgICAgcmFpc2UgVHlwZUVy cm9yKCdmaWxlcyBhcmd1bWVudCBtdXN0IGhhcyBsaXN0IHR5cGUsIG5vdCAlcycKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAlIHR5cGUoZmlsZXMpLl9fbmFtZV9fKQotICAgICAg ICBmb3IgZmlsZSBpbiBmaWxlczoKLSAgICAgICAgICAgIGlmIHR5cGUoZmlsZSkgaXMgbm90 IHN0cjoKLSAgICAgICAgICAgICAgICByYWlzZSBUeXBlRXJyb3IoJ2VhY2ggZmlsZSBtdXN0 IGJlIGEgc3RyaW5nIGluc3RhbmNlJykKLSAgICAgICAgZmlsZXMgPSBzb3J0ZWQoc2V0KGZp bGVzKSkKLSAgICAgICAgZmlsZXMgPSBbICclcyVzJyAlIChmaWxlLCBvcy5wYXRoLnNlcCkK LSAgICAgICAgICAgICAgICAgIGZvciBmaWxlIGluIGZpbGVzIF0KLSAgICAgICAgYXV4ZGly ID0gc2VsZi5jYWNoZVsnYXV4ZGlyJ10KLSAgICAgICAgZG9jYmFzZSA9IHNlbGYuY2FjaGVb J2RvY2Jhc2UnXQotICAgICAgICBzb3VyY2ViYXNlID0gc2VsZi5jYWNoZVsnc291cmNlYmFz ZSddCi0gICAgICAgIG00YmFzZSA9IHNlbGYuY2FjaGVbJ200YmFzZSddCi0gICAgICAgIHRl c3RzYmFzZSA9IHNlbGYuY2FjaGVbJ3Rlc3RzYmFzZSddCi0gICAgICAgIHJlc3VsdCA9IFtd Ci0gICAgICAgIGZvciBmaWxlIGluIGZpbGVzOgotICAgICAgICAgICAgaWYgZmlsZS5zdGFy dHN3aXRoKCdidWlsZC1hdXgvJyk6Ci0gICAgICAgICAgICAgICAgcGF0aCA9IGNvbnN0YW50 cy5zdWJzdGFydCgnYnVpbGQtYXV4LycsICclcy8nICUgYXV4ZGlyLCBmaWxlKQotICAgICAg ICAgICAgZWxpZiBmaWxlLnN0YXJ0c3dpdGgoJ2RvYy8nKToKLSAgICAgICAgICAgICAgICBw YXRoID0gY29uc3RhbnRzLnN1YnN0YXJ0KCdkb2MvJywgJyVzLycgJSBkb2NiYXNlLCBmaWxl KQotICAgICAgICAgICAgZWxpZiBmaWxlLnN0YXJ0c3dpdGgoJ2xpYi8nKToKLSAgICAgICAg ICAgICAgICBwYXRoID0gY29uc3RhbnRzLnN1YnN0YXJ0KCdsaWIvJywgJyVzLycgJSBzb3Vy Y2ViYXNlLCBmaWxlKQotICAgICAgICAgICAgZWxpZiBmaWxlLnN0YXJ0c3dpdGgoJ200Lycp OgotICAgICAgICAgICAgICAgIHBhdGggPSBjb25zdGFudHMuc3Vic3RhcnQoJ200LycsICcl cy8nICUgbTRiYXNlLCBmaWxlKQotICAgICAgICAgICAgZWxpZiBmaWxlLnN0YXJ0c3dpdGgo J3Rlc3RzLycpOgotICAgICAgICAgICAgICAgIHBhdGggPSBjb25zdGFudHMuc3Vic3RhcnQo J3Rlc3RzLycsICclcy8nICUgdGVzdHNiYXNlLCBmaWxlKQotICAgICAgICAgICAgZWxpZiBm aWxlLnN0YXJ0c3dpdGgoJ3Rlc3RzPWxpYi8nKToKLSAgICAgICAgICAgICAgICBwYXRoID0g Y29uc3RhbnRzLnN1YnN0YXJ0KCd0ZXN0cz1saWIvJywgJyVzLycgJSB0ZXN0c2Jhc2UsIGZp bGUpCi0gICAgICAgICAgICBlbGlmIGZpbGUuc3RhcnRzd2l0aCgndG9wLycpOgotICAgICAg ICAgICAgICAgIHBhdGggPSBjb25zdGFudHMuc3Vic3RhcnQoJ3RvcC8nLCAnJywgZmlsZSkK LSAgICAgICAgICAgIGVsc2U6ICAjIGZpbGUgaXMgbm90IGEgc3BlY2lhbCBmaWxlCi0gICAg ICAgICAgICAgICAgcGF0aCA9IGZpbGUKLSAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQob3Mu cGF0aC5ub3JtcGF0aChwYXRoKSkKLSAgICAgICAgcmV0dXJuIHNvcnRlZChzZXQocmVzdWx0 KSkKLQotICAgIGRlZiByZXdyaXRlX25ld19maWxlcyhzZWxmLCBmaWxlczogbGlzdFtzdHJd KSAtPiBsaXN0W3N0cl06CisgICAgZGVmIHJld3JpdGVfZmlsZXMoc2VsZiwgZmlsZXM6IGxp c3Rbc3RyXSkgLT4gbGlzdFtzdHJdOgogICAgICAgICAnJydSZXBsYWNlIGF1eGRpciwgZG9j YmFzZSwgc291cmNlYmFzZSwgbTRiYXNlIGFuZCB0ZXN0c2Jhc2UgZnJvbQogICAgICAgICBk ZWZhdWx0IHRvIHRoZWlyIHZlcnNpb24gZnJvbSBjb25maWcuJycnCiAgICAgICAgIGlmIHR5 cGUoZmlsZXMpIGlzIG5vdCBsaXN0OgpAQCAtOTU5LDEwICs5MjEsMTAgQEAgZGVmIHByZXBh cmUoc2VsZikgLT4gdHVwbGVbZGljdFtzdHIsIGxpc3Rbc3RyXV0sIGRpY3Rbc3RyLCBzdHJd XToKICAgICAgICAgb2xkX3RhYmxlID0gW10KICAgICAgICAgbmV3X3RhYmxlID0gW10KICAg ICAgICAgZm9yIHNyYyBpbiBvbGRfZmlsZXM6Ci0gICAgICAgICAgICBkZXN0ID0gc2VsZi5y ZXdyaXRlX29sZF9maWxlcyhbc3JjXSlbLTFdCisgICAgICAgICAgICBkZXN0ID0gc2VsZi5y ZXdyaXRlX2ZpbGVzKFtzcmNdKVstMV0KICAgICAgICAgICAgIG9sZF90YWJsZS5hcHBlbmQo dHVwbGUoW2Rlc3QsIHNyY10pKQogICAgICAgICBmb3Igc3JjIGluIG5ld19maWxlczoKLSAg ICAgICAgICAgIGRlc3QgPSBzZWxmLnJld3JpdGVfbmV3X2ZpbGVzKFtzcmNdKVstMV0KKyAg ICAgICAgICAgIGRlc3QgPSBzZWxmLnJld3JpdGVfZmlsZXMoW3NyY10pWy0xXQogICAgICAg ICAgICAgbmV3X3RhYmxlLmFwcGVuZCh0dXBsZShbZGVzdCwgc3JjXSkpCiAgICAgICAgIG9s ZF90YWJsZSA9IHNvcnRlZChzZXQob2xkX3RhYmxlKSkKICAgICAgICAgbmV3X3RhYmxlID0g c29ydGVkKHNldChuZXdfdGFibGUpKQotLSAKMi40NC4wCgo= --------------MUwY9P4pF2LxkI3SQGS35oAz--