diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:53:59 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:53:59 +0200 |
| commit | 67229fbdf7be2f3bb591a9da77f75c05ed0ab269 (patch) | |
| tree | aa94ff2eacbe2c5d46dbad3f41c9ca2eae849f73 /netlib/http/__init__.py | |
| parent | 5261bcdf4b0976b8db3295292143282b34f10c51 (diff) | |
| parent | 23d13e4c1282bc46c54222479c3b83032dad3335 (diff) | |
| download | mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.gz mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.bz2 mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.zip | |
Merge branch 'http-models'
Diffstat (limited to 'netlib/http/__init__.py')
| -rw-r--r-- | netlib/http/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/netlib/http/__init__.py b/netlib/http/__init__.py index 0ccf6b32..fd632cd5 100644 --- a/netlib/http/__init__.py +++ b/netlib/http/__init__.py @@ -1,14 +1,14 @@ from __future__ import absolute_import, print_function, division +from .request import Request +from .response import Response from .headers import Headers -from .models import Request, Response -from .models import ALPN_PROTO_HTTP1, ALPN_PROTO_H2 -from .models import HDR_FORM_MULTIPART, HDR_FORM_URLENCODED, CONTENT_MISSING +from .message import decoded, CONTENT_MISSING from . import http1, http2 __all__ = [ + "Request", + "Response", "Headers", - "Request", "Response", - "ALPN_PROTO_HTTP1", "ALPN_PROTO_H2", - "HDR_FORM_MULTIPART", "HDR_FORM_URLENCODED", "CONTENT_MISSING", + "decoded", "CONTENT_MISSING", "http1", "http2", ] |