summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_xmlrpc.py
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2009-07-19 22:29:24 (GMT)
committerKristján Valur Jónsson <kristjan@ccpgames.com>2009-07-19 22:29:24 (GMT)
commitaefde242fd7bc6c838107aaa734c8808c5d21fe2 (patch)
tree6857c209b6d08ddc0b5f67d98c5529eb484e5768 /Lib/test/test_xmlrpc.py
parent22101aa086ddf50928939b9a9cf84f9ca814e52a (diff)
downloadcpython-aefde242fd7bc6c838107aaa734c8808c5d21fe2.zip
cpython-aefde242fd7bc6c838107aaa734c8808c5d21fe2.tar.gz
cpython-aefde242fd7bc6c838107aaa734c8808c5d21fe2.tar.bz2
porting revision 74098 from trunk:
http://bugs.python.org/issue6499 zlib/gzip may not be present for all builds. Make xmlrpclib gracefully not supporg gzip encoding in this case
Diffstat (limited to 'Lib/test/test_xmlrpc.py')
-rw-r--r--Lib/test/test_xmlrpc.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index fab000d..3ea2e1b 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -799,7 +799,11 @@ def test_main():
xmlrpc_tests.append(SimpleServerTestCase)
xmlrpc_tests.append(KeepaliveServerTestCase1)
xmlrpc_tests.append(KeepaliveServerTestCase2)
- xmlrpc_tests.append(GzipServerTestCase)
+ try:
+ import gzip
+ xmlrpc_tests.append(GzipServerTestCase)
+ except ImportError:
+ pass #gzip not supported in this build
xmlrpc_tests.append(ServerProxyTestCase)
xmlrpc_tests.append(FailingServerTestCase)
xmlrpc_tests.append(CGIHandlerTestCase)