diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-03-31 18:07:58 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-31 18:07:58 +0200 |
commit | c788e18e03e22bccb7c08eb7ac8283f3732aa50d (patch) | |
tree | 6cd4f99c6570a5c4e7f00a48f91cba147c5b4974 /netlib/http/__init__.py | |
parent | 5552b5e782deaa510ebb00f337e39e99ac452aae (diff) | |
parent | de0f2cbcd349005a07679283befa2d209bd9d022 (diff) | |
download | mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.gz mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.bz2 mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.zip |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'netlib/http/__init__.py')
-rw-r--r-- | netlib/http/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/http/__init__.py b/netlib/http/__init__.py index fd632cd5..917080f7 100644 --- a/netlib/http/__init__.py +++ b/netlib/http/__init__.py @@ -2,13 +2,13 @@ from __future__ import absolute_import, print_function, division from .request import Request from .response import Response from .headers import Headers -from .message import decoded, CONTENT_MISSING +from .message import decoded from . import http1, http2 __all__ = [ "Request", "Response", "Headers", - "decoded", "CONTENT_MISSING", + "decoded", "http1", "http2", ] |