Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Try to normalize urls referring to local files (code copied from posixpath)

This commit is contained in:
Jack Jansen 1996-02-14 16:05:20 +00:00
parent e708f4005d
commit 0d12ead05c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/urllib.py
View File

@ -33,8 +33,20 @@ if os.name == 'mac':
if tp and tp <> 'file': if tp and tp <> 'file':
raise RuntimeError, 'Cannot convert non-local URL to pathname' raise RuntimeError, 'Cannot convert non-local URL to pathname'
components = string.split(pathname, '/') components = string.split(pathname, '/')
if '..' in components or '.' in components or '' in components[1:-1]: i = 0
raise RuntimeError, 'Cannot convert URL containing ., .. or // to pathname' while i < len(components):
if components[i] == '.':
del components[i]
elif components[i] == '..' and i > 0 and \
components[i-1] not in ('', '..'):
del components[i-1:i+1]
i = i-1
elif components[i] == '' and i > 0 and components[i-1] <> '':
del components[i]
else:
i = i+1
if not components or '..' in components or '.' in components or '' in components[1:-1]:
raise RuntimeError, 'Cannot normalize URL containing ., .. or // to pathname'
if not components[0]: if not components[0]:
# Absolute unix path, don't start with colon # Absolute unix path, don't start with colon
return string.join(components[1:], ':') return string.join(components[1:], ':')
@ -475,7 +487,7 @@ class ftpwrapper:
if file: cmd = 'LIST ' + file if file: cmd = 'LIST ' + file
else: cmd = 'LIST' else: cmd = 'LIST'
conn = self.ftp.transfercmd(cmd) conn = self.ftp.transfercmd(cmd)
return addclosehook(conn.makefile('r'), self.ftp.voidresp) return addclosehook(conn.makefile('rb'), self.ftp.voidresp)
# Base class for addinfo and addclosehook # Base class for addinfo and addclosehook
class addbase: class addbase: