From 674ae7718bc06a8b8c8b658075bf82c8198fb632 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 18 Mar 2014 12:49:12 +0100 Subject: Python 3: use new names of standard library modules Use "try/except ImportError" to try Python 2 and Python 3 names. --- paste/debug/testserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'paste/debug/testserver.py') diff --git a/paste/debug/testserver.py b/paste/debug/testserver.py index 26c477a..0adeefc 100755 --- a/paste/debug/testserver.py +++ b/paste/debug/testserver.py @@ -67,7 +67,7 @@ def serve(application, host=None, port=None, handler=None): return server if __name__ == '__main__': - import urllib + from six.moves.urllib.request import urlopen from paste.wsgilib import dump_environ server = serve(dump_environ) baseuri = ("http://%s:%s" % server.server_address) @@ -80,7 +80,7 @@ if __name__ == '__main__': import socket socket.setdefaulttimeout(5) # build a uri, fetch and return - return urllib.urlopen(baseuri + path).read() + return urlopen(baseuri + path).read() assert "PATH_INFO: /foo" in fetch("/foo") assert "PATH_INFO: /womble" in fetch("/womble") @@ -90,4 +90,4 @@ if __name__ == '__main__': # and then schedule a stop() server.stop() # and then... fetch it... - urllib.urlopen(baseuri) + urlopen(baseuri) -- cgit v1.2.1