aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/http1/assemble.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-05-29 11:14:46 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-05-29 11:14:46 +1200
commited415877d48251774012bd6aad4be91e9d558b79 (patch)
treee12a399c6df498f24aa5eeb9652dfaa90ab98dae /netlib/http/http1/assemble.py
parent00426534982ab7fba5617ad6422c13483a8e6521 (diff)
parent7971dce2231bc32c25b962d425d8ad935568a699 (diff)
downloadmitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz
mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2
mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip
Merge branch 'master' into solidcore
Diffstat (limited to 'netlib/http/http1/assemble.py')
-rw-r--r--netlib/http/http1/assemble.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/http/http1/assemble.py b/netlib/http/http1/assemble.py
index f06ad5a1..2f941877 100644
--- a/netlib/http/http1/assemble.py
+++ b/netlib/http/http1/assemble.py
@@ -1,9 +1,9 @@
from __future__ import absolute_import, print_function, division
from ... import utils
-import itertools
from ...exceptions import HttpException
+
def assemble_request(request):
if request.content is None:
raise HttpException("Cannot assemble flow with missing content")