]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merging revision 74100 from trunk:
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Sun, 19 Jul 2009 22:38:38 +0000 (22:38 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Sun, 19 Jul 2009 22:38:38 +0000 (22:38 +0000)
http://bugs.python.org/issue6499
gzip.GzipFile may not exist as a parent class

Lib/xmlrpc/client.py

index fc329252bf85a5db0e89ac3a565f7789a820e226..549006bc29976a39dbf19f14993b71365ef4ba1a 100644 (file)
@@ -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.
     """