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 7710e8cf5b12b73a9deb59836449f2ca664d28f6..87ff01f21953933749343cb7dc14ac9343b09312 100644 (file)
--- 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 8d51528ecc7ceaaa5762b9a23864235a71b4c89f..90aab8689cde7933028265679b60f41dc9d20566 100644 (file)
--- 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 1abfa2662178a5b65d5b028b7a4f7f496d516b64..dfb61232ec8b97105b4be10ddf659cc331891ed6 100644 (file)
--- 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