diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-20 21:40:46 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-20 21:40:46 -0500 |
| commit | 53916680d86f8b476f935b6b4780d107c1079354 (patch) | |
| tree | 71bd0084d5c0c04fbe93552fb872740e2828b7d9 /Lib/test/test_zipimport.py | |
| parent | c50c0b1767d85169bf519781f14e10955b0f8adc (diff) | |
| parent | 6649dd7aeac44e55dea08b332b817329e235e667 (diff) | |
| download | cpython-53916680d86f8b476f935b6b4780d107c1079354.tar.gz | |
merge 3.2
Diffstat (limited to 'Lib/test/test_zipimport.py')
| -rw-r--r-- | Lib/test/test_zipimport.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py index df5ff9d6a6..ab669cf199 100644 --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -9,12 +9,6 @@ import unittest from test import support from test.test_importhooks import ImportHooksBaseTestCase, test_src, test_co -# some tests can be ran even without zlib -try: - import zlib -except ImportError: - zlib = None - from zipfile import ZipFile, ZipInfo, ZIP_STORED, ZIP_DEFLATED import zipimport @@ -392,7 +386,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase): os.remove(filename) -@unittest.skipUnless(zlib, "requires zlib") +@support.requires_zlib class CompressedZipImportTestCase(UncompressedZipImportTestCase): compression = ZIP_DEFLATED |