diff -r d60678a567a9 -r 328739ea70c3 tests/tinyproxy.py
--- a/tests/tinyproxy.py	Tue Jun 23 22:38:21 2015 -0700
+++ b/tests/tinyproxy.py	Tue Jun 23 22:20:08 2015 -0700
@@ -45,7 +45,7 @@
             host_port = netloc, 80
         print "\t" "connect to %s:%d" % host_port
         try: soc.connect(host_port)
-        except socket.error, arg:
+        except socket.error as arg:
             try: msg = arg[1]
             except (IndexError, TypeError): msg = arg
             self.send_error(404, msg)