summaryrefslogtreecommitdiffstats
path: root/Lib/test/support.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-05-01 05:58:44 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-05-01 05:58:44 (GMT)
commitf6b16a4b507723b1a22e6cc5af80150f189b3e9d (patch)
tree64ed0bbb984057352c6392dcd64f86dedc5d42cb /Lib/test/support.py
parent9acbb6074f201e8747a1be577d6a71571528243a (diff)
downloadcpython-f6b16a4b507723b1a22e6cc5af80150f189b3e9d.zip
cpython-f6b16a4b507723b1a22e6cc5af80150f189b3e9d.tar.gz
cpython-f6b16a4b507723b1a22e6cc5af80150f189b3e9d.tar.bz2
Issue #14371: Support bzip2 in zipfile module.
Patch by Serhiy Storchaka.
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r--Lib/test/support.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 6c96501..48e8332 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -40,6 +40,11 @@ try:
except ImportError:
zlib = None
+try:
+ import bz2
+except ImportError:
+ bz2 = None
+
__all__ = [
"Error", "TestFailed", "ResourceDenied", "import_module",
"verbose", "use_resources", "max_memuse", "record_original_stdout",
@@ -57,7 +62,7 @@ __all__ = [
"get_attribute", "swap_item", "swap_attr", "requires_IEEE_754",
"TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
"import_fresh_module", "requires_zlib", "PIPE_MAX_SIZE", "failfast",
- "anticipate_failure", "run_with_tz"
+ "anticipate_failure", "run_with_tz", "requires_bz2"
]
class Error(Exception):
@@ -506,6 +511,8 @@ requires_IEEE_754 = unittest.skipUnless(
requires_zlib = unittest.skipUnless(zlib, 'requires zlib')
+requires_bz2 = unittest.skipUnless(bz2, 'requires bz2')
+
is_jython = sys.platform.startswith('java')
# Filename used for testing