aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
Diffstat (limited to 'netlib')
-rw-r--r--netlib/http/exceptions.py6
-rw-r--r--netlib/http/http1/protocol.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/netlib/http/exceptions.py b/netlib/http/exceptions.py
index 45bd2dce..7cd26c12 100644
--- a/netlib/http/exceptions.py
+++ b/netlib/http/exceptions.py
@@ -1,5 +1,6 @@
-class HttpError(Exception):
+from netlib import odict
+class HttpError(Exception):
def __init__(self, code, message):
super(HttpError, self).__init__(message)
self.code = code
@@ -9,12 +10,13 @@ class HttpErrorConnClosed(HttpError):
pass
-
class HttpAuthenticationError(Exception):
def __init__(self, auth_headers=None):
super(HttpAuthenticationError, self).__init__(
"Proxy Authentication Required"
)
+ if isinstance(auth_headers, dict):
+ auth_headers = odict.ODictCaseless(auth_headers.items())
self.headers = auth_headers
self.code = 407
diff --git a/netlib/http/http1/protocol.py b/netlib/http/http1/protocol.py
index a189bffc..2e85a762 100644
--- a/netlib/http/http1/protocol.py
+++ b/netlib/http/http1/protocol.py
@@ -302,7 +302,8 @@ class HTTP1Protocol(semantics.ProtocolMixin):
bytes_left = expected_size
while bytes_left:
chunk_size = min(bytes_left, max_chunk_size)
- yield "", self.tcp_handler.rfile.read(chunk_size), ""
+ content = self.tcp_handler.rfile.read(chunk_size)
+ yield "", content, ""
bytes_left -= chunk_size
else:
bytes_left = limit or -1