summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/importlib/_bootstrap.py2
-rw-r--r--Lib/test/test_zipfile.py1
-rw-r--r--Misc/ACKS1
3 files changed, 3 insertions, 1 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 7710e8cf5b..87ff01f219 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 8d51528ecc..90aab8689c 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 1abfa26621..dfb61232ec 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