From a606542e95f6de9880a2554c7ae0a4d6b02e742b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 21 Oct 2013 08:29:29 +0200
Subject: [PATCH] #19274: use captured_stdout() in the test suite; add NEWS
 entry.

---
 Doc/library/zipfile.rst  |  6 +++---
 Lib/test/test_zipfile.py | 13 +++++--------
 Misc/NEWS                |  8 +++++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 3ca20de1e4..f7303ea3f0 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -384,9 +384,6 @@ The :class:`PyZipFile` constructor takes the same parameters as the
 
    .. method:: PyZipFile.writepy(pathname, basename='', filterfunc=None)
 
-      .. versionadded:: 3.4
-         The *filterfunc* parameter.
-
       Search for files :file:`\*.py` and add the corresponding file to the
       archive.
 
@@ -419,6 +416,9 @@ The :class:`PyZipFile` constructor takes the same parameters as the
          test/bogus/__init__.pyc      # Subpackage directory
          test/bogus/myfile.pyc        # Submodule test.bogus.myfile
 
+      .. versionadded:: 3.4
+         The *filterfunc* parameter.
+
 
 .. _zipinfo-objects:
 
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 4a8c1af458..f57da5f94d 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -597,22 +597,19 @@ class PyZipFileTests(unittest.TestCase):
 
         with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
 
-            stdout = sys.stdout
-
             # first make sure that the test folder gives error messages
-            sys.stdout = reportSIO = io.StringIO()
-            zipfp.writepy(packagedir)
+            # (on the badsyntax_... files)
+            with captured_stdout() as reportSIO:
+                zipfp.writepy(packagedir)
             reportStr = reportSIO.getvalue()
             self.assertTrue('SyntaxError' in reportStr)
 
             # then check that the filter works
-            sys.stdout = reportSIO = io.StringIO()
-            zipfp.writepy(packagedir, filterfunc=lambda whatever:False)
+            with captured_stdout() as reportSIO:
+                zipfp.writepy(packagedir, filterfunc=lambda whatever: False)
             reportStr = reportSIO.getvalue()
             self.assertTrue('SyntaxError' not in reportStr)
 
-            sys.stdout = stdout
-
     def test_write_with_optimization(self):
         import email
         packagedir = os.path.dirname(email.__file__)
diff --git a/Misc/NEWS b/Misc/NEWS
index 379dfd70a5..c345bd05c4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,9 +10,15 @@ Projected release date: 2013-11-24
 Core and Builtins
 -----------------
 
-- Issue 19306: Add extra hints to the faulthandler module's stack
+- Issue #19306: Add extra hints to the faulthandler module's stack
   dumps that these are "upside down".
 
+Library
+-------
+
+- Issue #19274: Add a filterfunc parameter to PyZipFile.writepy.
+
+
 What's New in Python 3.4.0 Alpha 4?
 ===================================
 
-- 
2.40.0