Python 3: use new names of standard library modules

Use "try/except ImportError" to try Python 2 and Python 3 names.

2 files changed, 14 insertions, 4 deletions

diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py
index 2849ea8..f680bf6 100644
--- a/paste/debug/fsdiff.py
+++ b/paste/debug/fsdiff.py
@@ -12,7 +12,17 @@ the file was.
 import os
 from fnmatch import fnmatch
 from datetime import datetime
-from paste.util.UserDict24 import IterableUserDict
+
+try:
+    # Python 3
+    import collections.UserDict as IterableUserDict
+except ImportError:
+    try:
+        # Python 2.5-2.7
+        from UserDict import IterableUserDict
+    except ImportError:
+        # Python <= 2.4
+        from paste.util.UserDict24 import IterableUserDict
 import operator
 import re
 
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)