From aefde242fd7bc6c838107aaa734c8808c5d21fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Sun, 19 Jul 2009 22:29:24 +0000 Subject: 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 --- Lib/xmlrpc/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Lib/xmlrpc/server.py') diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index 273202f2df..219477550a 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -509,8 +509,11 @@ class SimpleXMLRPCRequestHandler(BaseHTTPRequestHandler): if len(response) > self.encode_threshold: q = self.accept_encodings().get("gzip", 0) if q: - response = gzip_encode(response) - self.send_header("Content-Encoding", "gzip") + try: + response = gzip_encode(response) + self.send_header("Content-Encoding", "gzip") + except NotImplementedError: + pass self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) @@ -523,6 +526,8 @@ class SimpleXMLRPCRequestHandler(BaseHTTPRequestHandler): if encoding == "gzip": try: return gzip_decode(data) + except NotImplementedError: + self.send_response(501, "encoding %r not supported" % encoding) except ValueError: self.send_response(400, "error decoding gzip content") else: -- cgit v1.2.1