From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Sun, 19 Jul 2009 22:38:38 +0000 (+0000)
Subject: merging revision 74100 from trunk:
X-Git-Tag: v3.2a1~2787
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ab0731f76cf685bb9d8cfa41951a0fe1ab8ab43;p=thirdparty%2FPython%2Fcpython.git

merging revision 74100 from trunk:
http://bugs.python.org/issue6499
gzip.GzipFile may not exist as a parent class
---

diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index fc329252bf85..549006bc2997 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.
     """