diff -cr ../Python-1.5.orig/Lib/ntpath.py ./Lib/ntpath.py *** ../Python-1.5.orig/Lib/ntpath.py Fri Dec 5 20:03:01 1997 --- Lib/ntpath.py Thu Mar 12 19:43:34 1998 *************** *** 13,25 **** # 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) # Return wheter a path is absolute. --- 13,25 ---- # Other normalizations (such as optimizing '../' away) are not done # (this is done by normpath). def normcase(s): ! """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. *************** *** 223,230 **** # XXX This degenerates in: 'is this the root?' on DOS def ismount(path): ! """Test whether a path is a mount point""" ! return isabs(splitdrive(path)[1]) # Directory tree walk. --- 223,231 ---- # XXX This degenerates in: 'is this the root?' on DOS def ismount(path): ! """Test whether a path is a mount point (defined as root of drive)""" ! p = splitdrive(path)[1] ! return len(p)==1 and p[0] in '/\\' # Directory tree walk. *************** *** 355,361 **** def normpath(path): """Normalize path, eliminating double slashes, etc.""" ! path = normcase(path) prefix, path = splitdrive(path) while path[:1] == os.sep: prefix = prefix + os.sep --- 356,362 ---- def normpath(path): """Normalize path, eliminating double slashes, etc.""" ! path = string.replace(path, "/", "\\") prefix, path = splitdrive(path) while path[:1] == os.sep: prefix = prefix + os.sep