mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
* posixpath.py: Fix border cases in normpath ('/foo/..' should return '/')
* ftplib.py: made cwd() use 'CDUP' when dirname is '..' * FL.py: added new constant FL_PLACE_FULLSCREEN
This commit is contained in:
parent
f1dc566328
commit
df5638662d
4 changed files with 14 additions and 6 deletions
|
@ -270,10 +270,12 @@ def expandvars(path):
|
|||
|
||||
def normpath(path):
|
||||
import string
|
||||
# Treat initial slashes specially
|
||||
slashes = ''
|
||||
while path[:1] == '/':
|
||||
slashes = slashes + '/'
|
||||
path = path[1:]
|
||||
comps = string.splitfields(path, '/')
|
||||
# If the path begins with '/', comps[0] is '', which we leave alone;
|
||||
# we also leave leading multiple slashes alone for compatibility
|
||||
# with certain networking naming schemes using //host/path
|
||||
i = 0
|
||||
while i < len(comps):
|
||||
if comps[i] == '.':
|
||||
|
@ -287,6 +289,6 @@ def normpath(path):
|
|||
else:
|
||||
i = i+1
|
||||
# If the path is now empty, substitute '.'
|
||||
if not comps:
|
||||
if not comps and not slashes:
|
||||
comps.append('.')
|
||||
return string.joinfields(comps, '/')
|
||||
return slashes + string.joinfields(comps, '/')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue