From ba53fe116ab68a90ab5b585f4ee71d17d4f17ee0 Mon Sep 17 00:00:00 2001 From: "which.linden" Date: Fri, 25 Jul 2008 21:07:45 -0700 Subject: [PATCH] [svn r140] Fixed wsgi.py to capitalize headers, fixed printing of ConnectionError exceptions when raised by FileScheme, cleaned up merge messup in coros. --- eventlet/httpc.py | 12 ++++++++---- eventlet/wsgi.py | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/eventlet/httpc.py b/eventlet/httpc.py index 5da36cc..7a920b3 100644 --- a/eventlet/httpc.py +++ b/eventlet/httpc.py @@ -257,10 +257,14 @@ class ConnectionError(Exception): return time.time() > expires def __repr__(self): - response = self.params.response - return "%s(url=%r, method=%r, status=%r, reason=%r, body=%r)" % ( - self.__class__.__name__, self.params.url, self.params.method, - response.status, response.reason, self.params.body) + try: + response = self.params.response + return "%s(url=%r, method=%r, status=%r, reason=%r, body=%r)" % ( + self.__class__.__name__, self.params.url, self.params.method, + response.status, response.reason, self.params.body) + except AttributeError: + return "%s(url=%r, method=%r)" % ( + self.__class__.__name__, self.params.url, self.params.method) __str__ = __repr__ diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py index 315cb5d..3a8bc48 100644 --- a/eventlet/wsgi.py +++ b/eventlet/wsgi.py @@ -190,7 +190,10 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): # Avoid dangling circular ref exc_info = None - headers_set[:] = [status, response_headers] + capitalized_headers = [('-'.join([x.capitalize() for x in key.split('-')]), value) + for key, value in response_headers] + + headers_set[:] = [status, capitalized_headers] return write try: