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/wsgi.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/wsgi.py')
| -rw-r--r-- | netlib/wsgi.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/netlib/wsgi.py b/netlib/wsgi.py index d6dfae5d..cde562f8 100644 --- a/netlib/wsgi.py +++ b/netlib/wsgi.py @@ -1,15 +1,15 @@ from __future__ import (absolute_import, print_function, division) -from io import BytesIO, StringIO -import urllib + import time import traceback - import six +from io import BytesIO from six.moves import urllib from netlib.utils import always_bytes, native from . import http, tcp + class ClientConn(object): def __init__(self, address): @@ -140,7 +140,7 @@ class WSGIAdaptor(object): elif state["status"]: raise AssertionError('Response already started') state["status"] = status - state["headers"] = http.Headers([[always_bytes(k), always_bytes(v)] for k,v in headers]) + state["headers"] = http.Headers([[always_bytes(k), always_bytes(v)] for k, v in headers]) if exc_info: self.error_page(soc, state["headers_sent"], traceback.format_tb(exc_info[2])) state["headers_sent"] = True @@ -154,7 +154,7 @@ class WSGIAdaptor(object): write(i) if not state["headers_sent"]: write(b"") - except Exception as e: + except Exception: try: s = traceback.format_exc() errs.write(s.encode("utf-8", "replace")) |