From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Fri, 6 May 2011 15:11:07 +0000 (+0200)
Subject: ntpath.samefile fails to detect that "A.TXT" and "a.txt" refer to the same file on... 
X-Git-Tag: v3.2.1b1~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6355c16d3623921cbecb156c23349b8a6fe32827;p=thirdparty%2FPython%2Fcpython.git

ntpath.samefile fails to detect that "A.TXT" and "a.txt" refer to the same file on Windows XP.

Noticed while researching a buildbot failure due to a patch for issue #10684.
---

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 419342d0c146..ec8a7ab23750 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -654,7 +654,7 @@ except (AttributeError, ImportError):
     # Non-Windows operating systems fake this method with an XP
     # approximation.
     def _getfinalpathname(f):
-        return abspath(f)
+        return normcase(abspath(f))
 
 def samefile(f1, f2):
     "Test whether two pathnames reference the same actual file"
diff --git a/Misc/NEWS b/Misc/NEWS
index 827e8373cba3..52d1d61c4443 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@ Core and Builtins
 Library
 -------
 
+- ntpath.samefile failed to notice that "a.txt" and "A.TXT" refer to the same
+  file on Windows XP. As noticed in issue #10684.
+
 - Issue #12000: When a SSL certificate has a subjectAltName without any
   dNSName entry, ssl.match_hostname() should use the subject's commonName.
   Patch by Nicolas Bareil.