[Python-checkins] cpython: Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart.

[eric.smith]

http://hg.python.org/cpython/rev/89af3880ca57
changeset:   68448:89af3880ca57
user:        Eric V. Smith <eric at trueblade.com>
date:        Mon Mar 14 11:57:16 2011 -0400
summary:
  Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart.

files:
  Lib/importlib/_bootstrap.py
  Lib/test/test_zipfile.py
  Misc/ACKS

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- 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
 
 
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
--- 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')
diff --git a/Misc/ACKS b/Misc/ACKS
--- 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

-- 
Repository URL: http://hg.python.org/cpython