aboutsummaryrefslogtreecommitdiff
path: root/dummyserver/proxy.py
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2015-12-22 14:09:50 +0000
committerChristopher Baines <mail@cbaines.net>2015-12-22 14:09:50 +0000
commitdff63335f212d32d7c1a4bb5276f2d31f5995ea1 (patch)
tree4b32f426e18fec38cbfa9468d0dfc0cbf2279363 /dummyserver/proxy.py
parent2b3d330a120a16e97cecd5163b5d454dcfe38a2b (diff)
downloadpython-urllib3-upstream.tar
python-urllib3-upstream.tar.gz
Import python-urllib3_1.13.1.orig.tar.gzupstream/1.13.1upstream
Diffstat (limited to 'dummyserver/proxy.py')
-rwxr-xr-xdummyserver/proxy.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/dummyserver/proxy.py b/dummyserver/proxy.py
index aca92a7..5b9984d 100755
--- a/dummyserver/proxy.py
+++ b/dummyserver/proxy.py
@@ -45,14 +45,14 @@ class ProxyHandler(tornado.web.RequestHandler):
def handle_response(response):
if response.error and not isinstance(response.error,
- tornado.httpclient.HTTPError):
+ tornado.httpclient.HTTPError):
self.set_status(500)
self.write('Internal server error:\n' + str(response.error))
self.finish()
else:
self.set_status(response.code)
for header in ('Date', 'Cache-Control', 'Server',
- 'Content-Type', 'Location'):
+ 'Content-Type', 'Location'):
v = response.headers.get(header)
if v:
self.set_header(header, v)
@@ -60,7 +60,8 @@ class ProxyHandler(tornado.web.RequestHandler):
self.write(response.body)
self.finish()
- req = tornado.httpclient.HTTPRequest(url=self.request.uri,
+ req = tornado.httpclient.HTTPRequest(
+ url=self.request.uri,
method=self.request.method, body=self.request.body,
headers=self.request.headers, follow_redirects=False,
allow_nonstandard_methods=True)
@@ -133,5 +134,5 @@ if __name__ == '__main__':
if len(sys.argv) > 1:
port = int(sys.argv[1])
- print ("Starting HTTP proxy on port %d" % port)
+ print("Starting HTTP proxy on port %d" % port)
run_proxy(port)