diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/test_language_http2.py | 8 | ||||
-rw-r--r-- | test/test_pathoc.py | 6 | ||||
-rw-r--r-- | test/test_pathod.py | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/test/test_language_http2.py b/test/test_language_http2.py index 3b36c01b..2e941f9a 100644 --- a/test/test_language_http2.py +++ b/test/test_language_http2.py @@ -1,9 +1,11 @@ import cStringIO +import netlib from netlib import tcp +from netlib.http import user_agents + from libpathod import language from libpathod.language import http2, base -import netlib import tutils @@ -18,7 +20,7 @@ def parse_response(s): def default_settings(): return language.Settings( request_host="foo.com", - protocol=netlib.http2.HTTP2Protocol(tcp.TCPClient(('localhost', 1234))) + protocol=netlib.http.http2.HTTP2Protocol(tcp.TCPClient(('localhost', 1234))) ) @@ -121,7 +123,7 @@ class TestRequest: def test_user_agent(self): r = parse_request('GET:/:r:ua') assert len(r.headers) == 1 - assert r.headers[0].values(default_settings()) == ("user-agent", netlib.http_uastrings.get_by_shortcut('a')[2]) + assert r.headers[0].values(default_settings()) == ("user-agent", user_agents.get_by_shortcut('a')[2]) def test_render_with_headers(self): s = cStringIO.StringIO() diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 926fcab5..894c14c5 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -4,13 +4,15 @@ import re import OpenSSL from mock import Mock -from netlib import tcp, http, http2, http_semantics, socks +from netlib import tcp, http, socks +from netlib.http import http2 + from libpathod import pathoc, test, version, pathod, language import tutils def test_response(): - r = http_semantics.Response("1.1", 200, "Message", {}, None, None) + r = http.Response("1.1", 200, "Message", {}, None, None) assert repr(r) diff --git a/test/test_pathod.py b/test/test_pathod.py index 12f7bac0..c8060594 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -3,7 +3,7 @@ import cStringIO import OpenSSL from libpathod import pathod, version -from netlib import tcp, http, http2 +from netlib import tcp, http import tutils |