aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/http1/assemble.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-01 11:12:10 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-01 11:12:10 +1200
commit44fdcb4b8291a5be6738f32d6fde307af3f2034e (patch)
tree64a4a2cfa6295d0a367d5484a0d86bc5e22ab779 /netlib/http/http1/assemble.py
parentbe644453649f0b0cf84822ad9de566b7dc744873 (diff)
downloadmitmproxy-44fdcb4b8291a5be6738f32d6fde307af3f2034e.tar.gz
mitmproxy-44fdcb4b8291a5be6738f32d6fde307af3f2034e.tar.bz2
mitmproxy-44fdcb4b8291a5be6738f32d6fde307af3f2034e.zip
Reorganise netlib imports according to Google Style Guide
Diffstat (limited to 'netlib/http/http1/assemble.py')
-rw-r--r--netlib/http/http1/assemble.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/http/http1/assemble.py b/netlib/http/http1/assemble.py
index 2f941877..00d1563b 100644
--- a/netlib/http/http1/assemble.py
+++ b/netlib/http/http1/assemble.py
@@ -1,12 +1,12 @@
from __future__ import absolute_import, print_function, division
-from ... import utils
-from ...exceptions import HttpException
+from netlib import utils
+from netlib import exceptions
def assemble_request(request):
if request.content is None:
- raise HttpException("Cannot assemble flow with missing content")
+ raise exceptions.HttpException("Cannot assemble flow with missing content")
head = assemble_request_head(request)
body = b"".join(assemble_body(request.data.headers, [request.data.content]))
return head + body
@@ -20,7 +20,7 @@ def assemble_request_head(request):
def assemble_response(response):
if response.content is None:
- raise HttpException("Cannot assemble flow with missing content")
+ raise exceptions.HttpException("Cannot assemble flow with missing content")
head = assemble_response_head(response)
body = b"".join(assemble_body(response.data.headers, [response.data.content]))
return head + body