traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2013-02-02 11:10:11 -05:00
parent a5df290e06 13e56c73b7
commit 99b0b72619
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/test/test_zipfile.py
View File

@ -434,8 +434,6 @@ class TestsWithSourceFile(unittest.TestCase):
('/foo/bar', 'foo/bar'), ('/foo/bar', 'foo/bar'),
('/foo/../bar', 'foo/bar'), ('/foo/../bar', 'foo/bar'),
('/foo/../../bar', 'foo/bar'), ('/foo/../../bar', 'foo/bar'),
('//foo/bar', 'foo/bar'),
('../../foo../../ba..r', 'foo../ba..r'),
] ]
if os.path.sep == '\\': if os.path.sep == '\\':
hacknames.extend([ hacknames.extend([
@ -447,16 +445,22 @@ class TestsWithSourceFile(unittest.TestCase):
(r'C:/foo/bar', 'foo/bar'), (r'C:/foo/bar', 'foo/bar'),
(r'C://foo/bar', 'foo/bar'), (r'C://foo/bar', 'foo/bar'),
(r'C:\foo\bar', 'foo/bar'), (r'C:\foo\bar', 'foo/bar'),
(r'//conky/mountpoint/foo/bar', 'foo/bar'), (r'//conky/mountpoint/foo/bar', 'conky/mountpoint/foo/bar'),
(r'\\conky\mountpoint\foo\bar', 'foo/bar'), (r'\\conky\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'),
(r'///conky/mountpoint/foo/bar', 'conky/mountpoint/foo/bar'), (r'///conky/mountpoint/foo/bar', 'conky/mountpoint/foo/bar'),
(r'\\\conky\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'), (r'\\\conky\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'),
(r'//conky//mountpoint/foo/bar', 'conky/mountpoint/foo/bar'), (r'//conky//mountpoint/foo/bar', 'conky/mountpoint/foo/bar'),
(r'\\conky\\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'), (r'\\conky\\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'),
(r'//?/C:/foo/bar', 'foo/bar'), (r'//?/C:/foo/bar', '_/C_/foo/bar'),
(r'\\?\C:\foo\bar', 'foo/bar'), (r'\\?\C:\foo\bar', '_/C_/foo/bar'),
(r'C:/../C:/foo/bar', 'C_/foo/bar'), (r'C:/../C:/foo/bar', 'C_/foo/bar'),
(r'a:b\c<d>e|f"g?h*i', 'b/c_d_e_f_g_h_i'), (r'a:b\c<d>e|f"g?h*i', 'b/c_d_e_f_g_h_i'),
('../../foo../../ba..r', 'foo/ba..r'),
])
else: # Unix
hacknames.extend([
('//foo/bar', 'foo/bar'),
('../../foo../../ba..r', 'foo../ba..r'),
]) ])
for arcname, fixedname in hacknames: for arcname, fixedname in hacknames:
@ -469,7 +473,8 @@ class TestsWithSourceFile(unittest.TestCase):
with zipfile.ZipFile(TESTFN2, 'r') as zipfp: with zipfile.ZipFile(TESTFN2, 'r') as zipfp:
writtenfile = zipfp.extract(arcname, targetpath) writtenfile = zipfp.extract(arcname, targetpath)
self.assertEqual(writtenfile, correctfile) self.assertEqual(writtenfile, correctfile,
msg="extract %r" % arcname)
self.check_file(correctfile, content) self.check_file(correctfile, content)
shutil.rmtree('target') shutil.rmtree('target')
@ -482,7 +487,8 @@ class TestsWithSourceFile(unittest.TestCase):
with zipfile.ZipFile(TESTFN2, 'r') as zipfp: with zipfile.ZipFile(TESTFN2, 'r') as zipfp:
writtenfile = zipfp.extract(arcname) writtenfile = zipfp.extract(arcname)
self.assertEqual(writtenfile, correctfile) self.assertEqual(writtenfile, correctfile,
msg="extract %r" % arcname)
self.check_file(correctfile, content) self.check_file(correctfile, content)
shutil.rmtree(fixedname.split('/')[0]) shutil.rmtree(fixedname.split('/')[0])

5
Lib/zipfile.py
View File

@ -1050,11 +1050,14 @@ class ZipFile(object):
arcname = os.path.splitdrive(arcname)[1] arcname = os.path.splitdrive(arcname)[1]
arcname = os.path.sep.join(x for x in arcname.split(os.path.sep) arcname = os.path.sep.join(x for x in arcname.split(os.path.sep)
if x not in ('', os.path.curdir, os.path.pardir)) if x not in ('', os.path.curdir, os.path.pardir))
# filter illegal characters on Windows
if os.path.sep == '\\': if os.path.sep == '\\':
# filter illegal characters on Windows
illegal = ':<>|"?*' illegal = ':<>|"?*'
table = string.maketrans(illegal, '_' * len(illegal)) table = string.maketrans(illegal, '_' * len(illegal))
arcname = arcname.translate(table) arcname = arcname.translate(table)
# remove trailing dots
arcname = (x.rstrip('.') for x in arcname.split(os.path.sep))
arcname = os.path.sep.join(x for x in arcname if x)
targetpath = os.path.join(targetpath, arcname) targetpath = os.path.join(targetpath, arcname)
targetpath = os.path.normpath(targetpath) targetpath = os.path.normpath(targetpath)