aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/wsgi.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-05-27 11:18:54 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-05-27 11:19:11 +0200
commite3d390e036430b9d7cc4b93679229fe118eb583a (patch)
tree1f10a2a59c8abef4bd24c8189d14602264b20fad /netlib/wsgi.py
parentf7b75ba8c21c66e38da81adf3b2c573b7dae87f3 (diff)
downloadmitmproxy-e3d390e036430b9d7cc4b93679229fe118eb583a.tar.gz
mitmproxy-e3d390e036430b9d7cc4b93679229fe118eb583a.tar.bz2
mitmproxy-e3d390e036430b9d7cc4b93679229fe118eb583a.zip
cleanup code with autopep8
run the following command: $ autopep8 -i -r -a -a .
Diffstat (limited to 'netlib/wsgi.py')
-rw-r--r--netlib/wsgi.py52
1 files changed, 28 insertions, 24 deletions
diff --git a/netlib/wsgi.py b/netlib/wsgi.py
index 1b979608..f393039a 100644
--- a/netlib/wsgi.py
+++ b/netlib/wsgi.py
@@ -7,17 +7,20 @@ from . import odict, tcp
class ClientConn(object):
+
def __init__(self, address):
self.address = tcp.Address.wrap(address)
class Flow(object):
+
def __init__(self, address, request):
self.client_conn = ClientConn(address)
self.request = request
class Request(object):
+
def __init__(self, scheme, method, path, headers, content):
self.scheme, self.method, self.path = scheme, method, path
self.headers, self.content = headers, content
@@ -42,6 +45,7 @@ def date_time_string():
class WSGIAdaptor(object):
+
def __init__(self, app, domain, port, sversion):
self.app, self.domain, self.port, self.sversion = app, domain, port, sversion
@@ -52,24 +56,24 @@ class WSGIAdaptor(object):
path_info = flow.request.path
query = ''
environ = {
- 'wsgi.version': (1, 0),
- 'wsgi.url_scheme': flow.request.scheme,
- 'wsgi.input': cStringIO.StringIO(flow.request.content),
- 'wsgi.errors': errsoc,
- 'wsgi.multithread': True,
- 'wsgi.multiprocess': False,
- 'wsgi.run_once': False,
- 'SERVER_SOFTWARE': self.sversion,
- 'REQUEST_METHOD': flow.request.method,
- 'SCRIPT_NAME': '',
- 'PATH_INFO': urllib.unquote(path_info),
- 'QUERY_STRING': query,
- 'CONTENT_TYPE': flow.request.headers.get('Content-Type', [''])[0],
- 'CONTENT_LENGTH': flow.request.headers.get('Content-Length', [''])[0],
- 'SERVER_NAME': self.domain,
- 'SERVER_PORT': str(self.port),
+ 'wsgi.version': (1, 0),
+ 'wsgi.url_scheme': flow.request.scheme,
+ 'wsgi.input': cStringIO.StringIO(flow.request.content),
+ 'wsgi.errors': errsoc,
+ 'wsgi.multithread': True,
+ 'wsgi.multiprocess': False,
+ 'wsgi.run_once': False,
+ 'SERVER_SOFTWARE': self.sversion,
+ 'REQUEST_METHOD': flow.request.method,
+ 'SCRIPT_NAME': '',
+ 'PATH_INFO': urllib.unquote(path_info),
+ 'QUERY_STRING': query,
+ 'CONTENT_TYPE': flow.request.headers.get('Content-Type', [''])[0],
+ 'CONTENT_LENGTH': flow.request.headers.get('Content-Length', [''])[0],
+ 'SERVER_NAME': self.domain,
+ 'SERVER_PORT': str(self.port),
# FIXME: We need to pick up the protocol read from the request.
- 'SERVER_PROTOCOL': "HTTP/1.1",
+ 'SERVER_PROTOCOL': "HTTP/1.1",
}
environ.update(extra)
if flow.client_conn.address:
@@ -91,25 +95,25 @@ class WSGIAdaptor(object):
<h1>Internal Server Error</h1>
<pre>%s"</pre>
</html>
- """%s
+ """ % s
if not headers_sent:
soc.write("HTTP/1.1 500 Internal Server Error\r\n")
soc.write("Content-Type: text/html\r\n")
- soc.write("Content-Length: %s\r\n"%len(c))
+ soc.write("Content-Length: %s\r\n" % len(c))
soc.write("\r\n")
soc.write(c)
def serve(self, request, soc, **env):
state = dict(
- response_started = False,
- headers_sent = False,
- status = None,
- headers = None
+ response_started=False,
+ headers_sent=False,
+ status=None,
+ headers=None
)
def write(data):
if not state["headers_sent"]:
- soc.write("HTTP/1.1 %s\r\n"%state["status"])
+ soc.write("HTTP/1.1 %s\r\n" % state["status"])
h = state["headers"]
if 'server' not in h:
h["Server"] = [self.sversion]