diff options
| author | Eric V. Smith <eric@trueblade.com> | 2011-03-14 11:57:16 -0400 |
|---|---|---|
| committer | Eric V. Smith <eric@trueblade.com> | 2011-03-14 11:57:16 -0400 |
| commit | 91f0359ee4fc067e4fb6fcdfaa5e8258333e68a9 (patch) | |
| tree | b509c342e831d81103f5509c842323c40b3a4f14 | |
| parent | 4169826a00bc786185cfce9371a3ba15157bf928 (diff) | |
| download | cpython-git-91f0359ee4fc067e4fb6fcdfaa5e8258333e68a9.tar.gz | |
Skip test if zlib not present. Closes #11498. Patch by Natalia B. Bidart.
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_zipfile.py | 1 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
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') @@ -80,6 +80,7 @@ Eric Beser Steven Bethard Stephen Bevan Ron Bickers +Natalia B. Bidart Adrian von Bidder David Binger Dominic Binks |