diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
| commit | ed415877d48251774012bd6aad4be91e9d558b79 (patch) | |
| tree | e12a399c6df498f24aa5eeb9652dfaa90ab98dae /netlib/http/request.py | |
| parent | 00426534982ab7fba5617ad6422c13483a8e6521 (diff) | |
| parent | 7971dce2231bc32c25b962d425d8ad935568a699 (diff) | |
| download | mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2 mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip | |
Merge branch 'master' into solidcore
Diffstat (limited to 'netlib/http/request.py')
| -rw-r--r-- | netlib/http/request.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/netlib/http/request.py b/netlib/http/request.py index 056a2d93..5a528bf2 100644 --- a/netlib/http/request.py +++ b/netlib/http/request.py @@ -1,14 +1,12 @@ from __future__ import absolute_import, print_function, division import re -import warnings import six from six.moves import urllib from netlib import utils from netlib.http import cookies -from netlib.odict import ODict from .. import encoding from ..multidict import MultiDictView from .headers import Headers |