Merge with default.

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
 
 

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')

Misc/ACKS

@@ -80,6 +80,7 @@ Eric Beser
 Steven Bethard
 Stephen Bevan
 Ron Bickers
+Natalia B. Bidart
 Adrian von Bidder
 David Binger
 Dominic Binks