diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-10-18 13:49:09 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-10-18 13:49:09 (GMT) |
| commit | 089144e511ca4b388ce8b29ecf2965a8215ff238 (patch) | |
| tree | 2cb4c09dc5d4bca6972fd590bae549e0b386ad89 /Lib/ntpath.py | |
| parent | fd6a55ec41fe2bd46cf0a5b4ebabb62eda5a19d7 (diff) | |
| download | cpython-089144e511ca4b388ce8b29ecf2965a8215ff238.zip cpython-089144e511ca4b388ce8b29ecf2965a8215ff238.tar.gz cpython-089144e511ca4b388ce8b29ecf2965a8215ff238.tar.bz2 | |
Merged revisions 85689 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85689 | hirokazu.yamamoto | 2010-10-18 21:13:18 +0900 | 3 lines
Issue #5117: Case normalization was needed on ntpath.relpath(). And
fixed root directory issue on posixpath.relpath(). (Ported working fixes
from ntpath)
........
Diffstat (limited to 'Lib/ntpath.py')
| -rw-r--r-- | Lib/ntpath.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py index dd7372f..9e4cff7 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -600,7 +600,7 @@ def relpath(path, start=curdir): path_abs = abspath(normpath(path)) start_drive, start_rest = splitdrive(start_abs) path_drive, path_rest = splitdrive(path_abs) - if start_drive != path_drive: + if normcase(start_drive) != normcase(path_drive): error = "path is on mount '{0}', start on mount '{1}'".format( path_drive, start_drive) raise ValueError(error) @@ -610,7 +610,7 @@ def relpath(path, start=curdir): # Work out how much of the filepath is shared by start and path. i = 0 for e1, e2 in zip(start_list, path_list): - if e1 != e2: + if normcase(e1) != normcase(e2): break i += 1 |