From 4169826a00bc786185cfce9371a3ba15157bf928 Mon Sep 17 00:00:00 2001 From: "Eric V. Smith" Date: Mon, 14 Mar 2011 10:56:33 -0400 Subject: Typos. --- Lib/importlib/_bootstrap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index cd7f5d6..7710e8c 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -765,7 +765,7 @@ def _gcd_import(name, package=None, level=0): 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 @@ def __import__(name, globals={}, locals={}, fromlist=[], level=0): 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__'] -- cgit v0.12 From 91f0359ee4fc067e4fb6fcdfaa5e8258333e68a9 Mon Sep 17 00:00:00 2001 From: "Eric V. Smith" Date: Mon, 14 Mar 2011 11:57:16 -0400 Subject: Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart. --- Lib/importlib/_bootstrap.py | 2 +- Lib/test/test_zipfile.py | 1 + Misc/ACKS | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 7710e8c..87ff01f 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 8d51528..90aab86 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 1abfa26..dfb6123 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 -- cgit v0.12