From 16a0bc278e34ca5b1b1717f21b9e6a4c4b2059f9 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 18 Feb 1998 13:48:31 +0000 Subject: [PATCH] (1) Change normpath() to *not* also call normcase(). (2) Fix normcase() to use string.lower() and string.replace() -- it turns out that the table constructed for translate() didn't work in locales that have a different number of lowercase and uppercase letters. --- Lib/ntpath.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 324ff2e3ec..2543890c35 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -13,13 +13,13 @@ import string # Other normalizations (such as optimizing '../' away) are not done # (this is done by normpath). -_normtable = string.maketrans(string.uppercase + "\\/", - string.lowercase + os.sep * 2) - def normcase(s): - """Normalize case of pathname. Makes all characters lowercase and all -slashes into backslashes""" - return string.translate(s, _normtable) + """Normalize case of pathname. + + Makes all characters lowercase and all slashes into backslashes. + + """ + return string.lower(string.replace(s, "/", "\\")) # Return wheter a path is absolute. @@ -356,7 +356,7 @@ are left unchanged""" def normpath(path): """Normalize path, eliminating double slashes, etc.""" - path = normcase(path) + path = string.replace(path, "/", "\\") prefix, path = splitdrive(path) while path[:1] == os.sep: prefix = prefix + os.sep -- 2.40.0