From b889e9e1a2576b0f0aadb4180dd6f4c75db204d6 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 5 Sep 2015 18:16:08 +0200 Subject: adjust to new netlib headers --- libpathod/language/http.py | 6 +++--- libpathod/language/http2.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'libpathod/language') diff --git a/libpathod/language/http.py b/libpathod/language/http.py index 2e8d2af3..bb9db3c0 100644 --- a/libpathod/language/http.py +++ b/libpathod/language/http.py @@ -197,10 +197,10 @@ class Response(_HTTPMessage): 1, Code(101) ) - hdrs = netlib.websockets.WebsocketsProtocol.server_handshake_headers( + headers = netlib.websockets.WebsocketsProtocol.server_handshake_headers( settings.websocket_key ) - for i in hdrs.lst: + for i in headers.fields: if not get_header(i[0], self.headers): tokens.append( Header( @@ -309,7 +309,7 @@ class Request(_HTTPMessage): 1, Method("get") ) - for i in netlib.websockets.WebsocketsProtocol.client_handshake_headers().lst: + for i in netlib.websockets.WebsocketsProtocol.client_handshake_headers().fields: if not get_header(i[0], self.headers): tokens.append( Header( diff --git a/libpathod/language/http2.py b/libpathod/language/http2.py index 8a82fc99..2c3f1786 100644 --- a/libpathod/language/http2.py +++ b/libpathod/language/http2.py @@ -1,7 +1,6 @@ import pyparsing as pp -from netlib import odict -from netlib.http import user_agents, semantics +from netlib.http import user_agents, semantics, Headers from . import base, message """ @@ -179,7 +178,7 @@ class Response(_HTTP2Message): if self.rendered_values: return self.rendered_values else: - headers = odict.ODictCaseless([header.values(settings) for header in self.headers]) + headers = Headers([header.values(settings) for header in self.headers]) body = self.body if body: @@ -262,7 +261,7 @@ class Request(_HTTP2Message): if self.nested_response: path += self.nested_response.parsed.spec() - headers = odict.ODictCaseless([header.values(settings) for header in self.headers]) + headers = Headers([header.values(settings) for header in self.headers]) body = self.body if body: -- cgit v1.2.3