From df29d2dc479c969534e60b74deef6431e69a185f Mon Sep 17 00:00:00 2001 From: rdw Date: Wed, 3 Sep 2008 11:50:04 -0700 Subject: [PATCH] Fixed silly error messages that looked like 'of content-type ' --- eventlet/httpc.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eventlet/httpc.py b/eventlet/httpc.py index ffaa7e9..67dbf31 100644 --- a/eventlet/httpc.py +++ b/eventlet/httpc.py @@ -274,15 +274,16 @@ class ConnectionError(Exception): class UnparseableResponse(ConnectionError): """Raised when a loader cannot parse the response from the server.""" - def __init__(self, content_type, response, url): + def __init__(self, content_type, parser, response, url): self.content_type = content_type + self.parser = parser self.response = response self.url = url Exception.__init__(self) def __repr__(self): - return "Could not parse the data at the URL %r of content-type %r\nData:\n%s" % ( - self.url, self.content_type, self.response) + return "Could not parse the data at the URL %r of content-type %r with %r\nData:\n%s" % ( + self.url, self.content_type, self.parser, self.response) __str__ = __repr__ @@ -562,7 +563,10 @@ class HttpSuite(object): except KeyboardInterrupt: raise except Exception, e: - raise UnparseableResponse(self.loader, body, params.url) + raise UnparseableResponse(response.msg.get('content-type', '(unknown)'), + self.loader, + body, + params.url) return response.status, response.msg, body