From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 16 Nov 2022 09:45:31 +0000 (-0800)
Subject: gh-98940: Fix Mac/Extras.install.py File filter bug (GH-98943)
X-Git-Tag: v3.11.1~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a208d5e24981bb3f80dc5932a358136ceb60a10;p=thirdparty%2FPython%2Fcpython.git

gh-98940: Fix Mac/Extras.install.py File filter bug (GH-98943)


Slightly simplify the script and fix a case issue in the name of ``.DS_Store`` files.

(cherry picked from commit ea88d34de27ba2b3acaeb03c7dc7829dff40ea5c)

Co-authored-by: zhangbo <zhangbo2012@outlook.com>
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Mac/Extras.install.py b/Mac/Extras.install.py
index ab1af71dfd82..41bfa53d6163 100644
--- a/Mac/Extras.install.py
+++ b/Mac/Extras.install.py
@@ -9,10 +9,9 @@ verbose = 1
 debug = 0
 
 def isclean(name):
-    if name == 'CVS': return 0
-    if name == '.cvsignore': return 0
-    if name == '.DS_store': return 0
-    if name == '.svn': return 0
+    if name in ('CVS', '.cvsignore', '.svn'):
+        return 0
+    if name.lower() == '.ds_store': return 0
     if name.endswith('~'): return 0
     if name.endswith('.BAK'): return 0
     if name.endswith('.pyc'): return 0
diff --git a/Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst b/Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst
new file mode 100644
index 000000000000..18ef0b0e2523
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst
@@ -0,0 +1 @@
+Fix ``Mac/Extras.install.py`` file filter bug.