[Python-checkins] cpython (merge default -> default): merge

[ronald.oussoren]

http://hg.python.org/cpython/rev/f12c3706debf
changeset:   68453:f12c3706debf
parent:      68451:4c651c1abd28
parent:      68448:89af3880ca57
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Mon Mar 14 12:12:23 2011 -0400
summary:
  merge

files:
  

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
 
 
@@ -765,7 +765,7 @@
     being made from, and the level adjustment.
 
     This function represents the greatest common denominator of functionality
-    between import_module and __import__. This includes settting __package__ if
+    between import_module and __import__. This includes setting __package__ if
     the loader did not.
 
     """
@@ -855,7 +855,7 @@
         module = _gcd_import(name)
     else:
         # __package__ is not guaranteed to be defined or could be set to None
-        # to represent that it's proper value is unknown
+        # to represent that its proper value is unknown
         package = globals.get('__package__')
         if package is None:
             package = globals['__name__']
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