diff options
| author | Reid Kleckner <reid@kleckner.net> | 2011-03-14 16:12:18 (GMT) |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2011-03-14 16:12:18 (GMT) |
| commit | 84857017144469bf91bcec451c7835894432dd41 (patch) | |
| tree | 5def05a237fc95fa4473ed78f675c6602d945b17 /Lib | |
| parent | 31aa7dd14196858ed25716723f42702c96ede3bd (diff) | |
| parent | 91f0359ee4fc067e4fb6fcdfaa5e8258333e68a9 (diff) | |
| download | cpython-84857017144469bf91bcec451c7835894432dd41.zip cpython-84857017144469bf91bcec451c7835894432dd41.tar.gz cpython-84857017144469bf91bcec451c7835894432dd41.tar.bz2 | |
Merge with default.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_zipfile.py | 1 |
2 files changed, 2 insertions, 1 deletions
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') |