[Checkins] SVN: zope.testing/branches/regebro-python3/src/zope/testing/server.py py3: urllib2.urlparse-->urllib.parse

[Wolfgang Schnerring]

Log message for revision 103887:
  py3: urllib2.urlparse-->urllib.parse
  

Changed:
  U   zope.testing/branches/regebro-python3/src/zope/testing/server.py

-=-
Modified: zope.testing/branches/regebro-python3/src/zope/testing/server.py
===================================================================
--- zope.testing/branches/regebro-python3/src/zope/testing/server.py	2009-09-13 08:38:33 UTC (rev 103886)
+++ zope.testing/branches/regebro-python3/src/zope/testing/server.py	2009-09-13 08:39:36 UTC (rev 103887)
@@ -24,10 +24,13 @@
 
 $Id$
 """
-import urllib2
+import sys
+if sys.version_info < (3,):
+    import urllib2.urlparse as urlparse
+else:
+    import urllib.parse as urlparse
 import webbrowser
 from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-import sys
 
 
 def makeRequestHandler(http, user=None, password=None):
@@ -80,10 +83,10 @@
         'http://localhost:555/index.html'
 
     """
-    (scheme, netloc, url, query, fragment) = urllib2.urlparse.urlsplit(url)
+    (scheme, netloc, url, query, fragment) = urlparse.urlsplit(url)
     netloc = netloc.split(':')[0]
     netloc = "%s:%s" % (netloc, port)
-    url = urllib2.urlparse.urlunsplit((scheme, netloc, url, query, fragment))
+    url = urlparse.urlunsplit((scheme, netloc, url, query, fragment))
     return url