diff options
| author | Sam Cleveland <sam@zombisoft.com> | 2015-11-11 20:27:10 -0600 |
|---|---|---|
| committer | Sam Cleveland <sam@zombisoft.com> | 2015-11-11 20:27:10 -0600 |
| commit | 2bd7bcb3711a20b6a166710f2c7d989d8ae5fcc8 (patch) | |
| tree | 4dc07144bfe36acce1f6df490522e099d54b1b10 | |
| parent | 6689a342ae68c75bd52d81ee1959b1946739eca4 (diff) | |
| download | mitmproxy-2bd7bcb3711a20b6a166710f2c7d989d8ae5fcc8.tar.gz mitmproxy-2bd7bcb3711a20b6a166710f2c7d989d8ae5fcc8.tar.bz2 mitmproxy-2bd7bcb3711a20b6a166710f2c7d989d8ae5fcc8.zip | |
Porting to Python 3.4
Updated wsgi to support Python 3.4 byte strings.
Updated test_wsgi to remove py.test warning for TestApp having an
__init__ constructor.
samc$ sudo py.test netlib/test/test_wsgi.py -r w
= test session starts =
platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1
rootdir: /Users/samc/src/python/netlib, inifile:
collected 6 items
netlib/test/test_wsgi.py ......
= 6 passed in 0.20 seconds =
| -rw-r--r-- | netlib/wsgi.py | 11 | ||||
| -rw-r--r-- | test/test_wsgi.py | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/netlib/wsgi.py b/netlib/wsgi.py index df248a19..d6dfae5d 100644 --- a/netlib/wsgi.py +++ b/netlib/wsgi.py @@ -96,16 +96,17 @@ class WSGIAdaptor(object): Make a best-effort attempt to write an error page. If headers are already sent, we just bung the error into the page. """ - c = b""" + c = """ <html> <h1>Internal Server Error</h1> - <pre>%s"</pre> + <pre>{err}"</pre> </html> - """.strip() % s.encode() + """.format(err=s).strip().encode() + if not headers_sent: soc.write(b"HTTP/1.1 500 Internal Server Error\r\n") soc.write(b"Content-Type: text/html\r\n") - soc.write(b"Content-Length: %s\r\n" % len(c)) + soc.write("Content-Length: {length}\r\n".format(length=len(c)).encode()) soc.write(b"\r\n") soc.write(c) @@ -119,7 +120,7 @@ class WSGIAdaptor(object): def write(data): if not state["headers_sent"]: - soc.write(b"HTTP/1.1 %s\r\n" % state["status"].encode()) + soc.write("HTTP/1.1 {status}\r\n".format(status=state["status"]).encode()) headers = state["headers"] if 'server' not in headers: headers["Server"] = self.sversion diff --git a/test/test_wsgi.py b/test/test_wsgi.py index fe6f09b5..ec6e8c63 100644 --- a/test/test_wsgi.py +++ b/test/test_wsgi.py @@ -12,8 +12,6 @@ def tflow(): class TestApp: - def __init__(self): - self.called = False def __call__(self, environ, start_response): self.called = True |