summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/ntpath.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 419342d0c1..ec8a7ab237 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 827e8373cb..52d1d61c44 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.