From: Eric V. Smith <eric@trueblade.com>
Date: Mon, 14 Mar 2011 15:57:16 +0000 (-0400)
Subject: Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart.
X-Git-Tag: v3.3.0a1~2928^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91f0359ee4fc067e4fb6fcdfaa5e8258333e68a9;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 7710e8cf5b12..87ff01f21953 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -240,7 +240,7 @@ class BuiltinImporter:
     @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
index 8d51528ecc7c..90aab8689cde 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -489,6 +489,7 @@ class TestsWithSourceFile(unittest.TestCase):
         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
index 1abfa2662178..dfb61232ec8b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -80,6 +80,7 @@ Eric Beser
 Steven Bethard
 Stephen Bevan
 Ron Bickers
+Natalia B. Bidart
 Adrian von Bidder
 David Binger
 Dominic Binks