diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-21 10:15:37 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-21 10:15:37 +1200 |
| commit | 96d8ec1ee33b076a472afc3053fdd8256559fcc3 (patch) | |
| tree | 933549b94c497b70eb6165f90bef191eebca4cc7 /netlib/http/__init__.py | |
| parent | 84144ca0c635f4a42c8ba8a13e779fe127a81d45 (diff) | |
| parent | b538138ead1dc8550f2d4e4a3f30ff70abb95f53 (diff) | |
| download | mitmproxy-96d8ec1ee33b076a472afc3053fdd8256559fcc3.tar.gz mitmproxy-96d8ec1ee33b076a472afc3053fdd8256559fcc3.tar.bz2 mitmproxy-96d8ec1ee33b076a472afc3053fdd8256559fcc3.zip | |
Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-multidict
Diffstat (limited to 'netlib/http/__init__.py')
| -rw-r--r-- | netlib/http/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/http/__init__.py b/netlib/http/__init__.py index 917080f7..9fafa28f 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 -from . import http1, http2 +from .message import MultiDictView, decoded +from . import http1, http2, status_codes __all__ = [ "Request", "Response", "Headers", - "decoded", - "http1", "http2", + "MultiDictView", "decoded", + "http1", "http2", "status_codes", ] |