summaryrefslogtreecommitdiffstats
path: root/Lib/xmlrpc
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2009-07-19 22:38:38 (GMT)
committerKristján Valur Jónsson <kristjan@ccpgames.com>2009-07-19 22:38:38 (GMT)
commit9ab0731f76cf685bb9d8cfa41951a0fe1ab8ab43 (patch)
tree6fb587e4d11c1d3d271aae597a4fddbce52790bc /Lib/xmlrpc
parentaefde242fd7bc6c838107aaa734c8808c5d21fe2 (diff)
downloadcpython-9ab0731f76cf685bb9d8cfa41951a0fe1ab8ab43.zip
cpython-9ab0731f76cf685bb9d8cfa41951a0fe1ab8ab43.tar.gz
cpython-9ab0731f76cf685bb9d8cfa41951a0fe1ab8ab43.tar.bz2
merging revision 74100 from trunk:
http://bugs.python.org/issue6499 gzip.GzipFile may not exist as a parent class
Diffstat (limited to 'Lib/xmlrpc')
-rw-r--r--Lib/xmlrpc/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index fc32925..549006b 100644
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -1076,7 +1076,7 @@ def gzip_decode(data):
# @param response A stream supporting a read() method
# @return a file-like object that the decoded data can be read() from
-class GzipDecodedResponse(gzip.GzipFile):
+class GzipDecodedResponse(gzip.GzipFile if gzip else object):
"""a file-like object to decode a response encoded with the gzip
method, as described in RFC 1952.
"""