commit 91f0359ee4fc067e4fb6fcdfaa5e8258333e68a9
author Eric V. Smith <eric@trueblade.com> Mon Mar 14 11:57:16 2011 -0400
committer Eric V. Smith <eric@trueblade.com> Mon Mar 14 11:57:16 2011 -0400
tree b509c342e831d81103f5509c842323c40b3a4f14
parent 4169826a00bc786185cfce9371a3ba15157bf928

Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart.

Lib/importlib/_bootstrap.py

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 7710e8c..87ff01f 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -240,7 +240,7 @@
     @classmethod
     @_requires_builtin
     def is_package(cls, fullname):
-        """Return None as built-in module are never packages."""
+        """Return None as built-in modules are never packages."""
         return False
 
 

Lib/test/test_zipfile.py

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 8d51528..90aab86 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -489,6 +489,7 @@
         except zipfile.BadZipFile:
             self.assertTrue(zipfp2.fp is None, 'zipfp is not closed')
 
+    @skipUnless(zlib, "requires zlib")
     def test_unicode_filenames(self):
         # bug #10801
         fname = findfile('zip_cp437_header.zip')

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index 1abfa26..dfb6123 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -80,6 +80,7 @@
 Steven Bethard
 Stephen Bevan
 Ron Bickers
+Natalia B. Bidart
 Adrian von Bidder
 David Binger
 Dominic Binks