diff options
author | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:03:26 -0700 |
---|---|---|
committer | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:03:26 -0700 |
commit | 6d16f44ab723ef23a633b175c1cb4575919b07c4 (patch) | |
tree | 2cf1d25543e4e81475aa97207d91a8629ce538dd /netlib/http/__init__.py | |
parent | e56198ae7cf5de1d00c799133d3257434072998e (diff) | |
download | mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.gz mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.bz2 mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.zip |
Merge with master
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", ] |