mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-08 13:42:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge from 3.4.

Browse source
This commit is contained in:
Larry Hastings 2015-05-08 06:58:56 -07:00
commit 8093254597
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_zipfile.py
View file

@ -750,9 +750,10 @@ class PyZipFileTests(unittest.TestCase):
self.assertTrue('SyntaxError' not in reportStr) self.assertTrue('SyntaxError' not in reportStr)
# then check that the filter works on individual files # then check that the filter works on individual files
def filter(path):
return not os.path.basename(path).startswith("bad")
with captured_stdout() as reportSIO, self.assertWarns(UserWarning): with captured_stdout() as reportSIO, self.assertWarns(UserWarning):
zipfp.writepy(packagedir, filterfunc=lambda fn: zipfp.writepy(packagedir, filterfunc=filter)
'bad' not in fn)
reportStr = reportSIO.getvalue() reportStr = reportSIO.getvalue()
if reportStr: if reportStr:
print(reportStr) print(reportStr)

3
Misc/NEWS
View file

@ -69,6 +69,9 @@ Library
Tests Tests
----- -----
- Issue #21520: test_zipfile no longer fails if the word 'bad' appears
anywhere in the name of the current directory.
- Issue #9517: Move script_helper into the support package. - Issue #9517: Move script_helper into the support package.
Patch by Christie Wilson. Patch by Christie Wilson.