changeset:   95913:bff966aed6a3
branch:      3.4
parent:      95911:7eb524cbe6e5
user:        Larry Hastings <larry@hastings.org>
date:        Fri May 08 06:54:58 2015 -0700
files:       Lib/test/test_zipfile.py Misc/NEWS
description:
Issue #21520: test_zipfile no longer fails if the word 'bad' appears
anywhere in the name of the current directory.


diff -r 7eb524cbe6e5 -r bff966aed6a3 Lib/test/test_zipfile.py
--- a/Lib/test/test_zipfile.py	Fri May 08 14:13:41 2015 +0300
+++ b/Lib/test/test_zipfile.py	Fri May 08 06:54:58 2015 -0700
@@ -719,9 +719,10 @@
             self.assertTrue('SyntaxError' not in reportStr)
 
             # 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):
-                zipfp.writepy(packagedir, filterfunc=lambda fn:
-                                                     'bad' not in fn)
+                zipfp.writepy(packagedir, filterfunc=filter)
             reportStr = reportSIO.getvalue()
             if reportStr:
                 print(reportStr)
diff -r 7eb524cbe6e5 -r bff966aed6a3 Misc/NEWS
--- a/Misc/NEWS	Fri May 08 14:13:41 2015 +0300
+++ b/Misc/NEWS	Fri May 08 06:54:58 2015 -0700
@@ -228,6 +228,9 @@
 Tests
 -----
 
+- Issue #21520: test_zipfile no longer fails if the word 'bad' appears
+  anywhere in the name of the current directory.
+
 - Issue #23799: Added test.support.start_threads() for running and
   cleaning up multiple threads.