Python 3 preparation: update urllib / urllib2 / urlparse imports.

The existing roundup/anypy/urllib_.py is extended to cover more
imports and used in more places.  Manual patch.

Author: jsm28

frontends/ZRoundup/ZRoundup.py

@@ -26,7 +26,7 @@
 advantages over regular CGI :)
 '''
 
-import urlparse
+from roundup.anypy import urllib_
 
 from Globals import InitializeClass, HTMLFile
 from OFS.SimpleItem import Item
@@ -141,7 +141,7 @@ def roundup_opendb(self):
         env = self.REQUEST.environ
 
         # figure out the path components to set
-        url = urlparse.urlparse( self.absolute_url() )
+        url = urllib_.urlparse( self.absolute_url() )
         path = url[2]
         path_components = path.split( '/' )
 
@@ -168,10 +168,10 @@ def index_html(self):
         # PATH_INFO, as defined by the CGI spec, has the *real* request path
         orig_path = self.REQUEST.environ['PATH_INFO']
         if orig_path[-1] != '/' : 
-            url = urlparse.urlparse( self.absolute_url() )
+            url = urllib_.urlparse( self.absolute_url() )
             url = list( url ) # make mutable
             url[2] = url[2]+'/' # patch
-            url = urlparse.urlunparse( url ) # reassemble
+            url = urllib_.urlunparse( url ) # reassemble
             RESPONSE = self.REQUEST.RESPONSE
             RESPONSE.setStatus( "MovedPermanently" ) # 301
             RESPONSE.setHeader( "Location" , url )

roundup/anypy/urllib_.py

@@ -1,8 +1,11 @@
 
 try:
     # Python 3+
-    from urllib.parse import quote, urlencode, urlparse, parse_qs, urlunparse
+    from urllib.parse import quote, unquote, urlencode, urlparse, parse_qs, \
+        urlunparse
+    from urllib.request import urlopen
 except:
     # Python 2.5-2.7
-    from urllib import quote, urlencode
+    from urllib import quote, unquote, urlencode
+    from urllib2 import urlopen
     from urlparse import urlparse, parse_qs, urlunparse

roundup/cgi/TAL/XMLParser.py

@@ -13,6 +13,7 @@
 ##############################################################################
 # Modifications for Roundup:
 # 1. commented out zLOG references
+# 2. use roundup.anypy.urllib_
 """
 Generic expat-based XML parser base class.
 """
@@ -83,8 +84,8 @@ def parseString(self, s):
         self.parser.Parse(s, 1)
 
     def parseURL(self, url):
-        import urllib
-        self.parseStream(urllib.urlopen(url))
+        import roundup.anypy.urllib_
+        self.parseStream(roundup.anypy.urllib_.urlopen(url))
 
     def parseStream(self, stream):
         self.parser.ParseFile(stream)

roundup/cgi/templating.py

@@ -20,11 +20,12 @@
 __docformat__ = 'restructuredtext'
 
 
-import cgi, urllib, re, os.path, mimetypes, csv, string
+import cgi, re, os.path, mimetypes, csv, string
 import calendar
 import textwrap
 import time, hashlib
 
+from roundup.anypy import urllib_
 from roundup import hyperdb, date, support
 from roundup import i18n
 from roundup.i18n import _
@@ -763,7 +764,7 @@ def classhelp(self, properties=None, label=''"(list)", width='500',
             for x in filterprops:
                 (name, values) = x.split('=')
                 names.append(name)
-                filtervalues.append('&%s=%s' % (name, urllib.quote(values)))
+                filtervalues.append('&%s=%s' % (name, urllib_.quote(values)))
             filter = '&@filter=%s%s' % (','.join(names), ''.join(filtervalues))
         else:
            filter = ''
@@ -1199,7 +1200,7 @@ def renderQueryForm(self):
         req.classname = self._klass.get(self._nodeid, 'klass')
         name = self._klass.get(self._nodeid, 'name')
         req.updateFromURL(self._klass.get(self._nodeid, 'url') +
-            '&@queryname=%s'%urllib.quote(name))
+            '&@queryname=%s'%urllib_.quote(name))
 
         # new template, using the specified classname and request
         # [ ] the custom logic for search page doesn't belong to
@@ -1219,7 +1220,7 @@ def download_url(self):
         """
         name = self._klass.get(self._nodeid, 'name')
         url = '%s%s/%s'%(self._classname, self._nodeid, name)
-        return urllib.quote(url)
+        return urllib_.quote(url)
 
     def copy_url(self, exclude=("messages", "files")):
         """Construct a URL for creating a copy of this item
@@ -1246,7 +1247,7 @@ def copy_url(self, exclude=("messages", "files")):
                     query[name] = ",".join(self._klass.get(self._nodeid, name))
 
         return self._classname + "?" + "&".join(
-            ["%s=%s" % (key, urllib.quote(value))
+            ["%s=%s" % (key, urllib_.quote(value))
                 for key, value in query.items()])
 
 class _HTMLUser(_HTMLItem):
@@ -1463,7 +1464,7 @@ def _hyper_repl_rst(self, match):
 
     def url_quote(self):
         """ Return the string in plain format but escaped for use in a url """
-        return urllib.quote(self.plain())
+        return urllib_.quote(self.plain())
 
     def hyperlinked(self):
         """ Render a "hyperlinked" version of the text """
@@ -2855,7 +2856,7 @@ def indexargs_url(self, url, args):
             dispname otherwise the parameter will be omitted
             from the url.
         """
-        q = urllib.quote
+        q = urllib_.quote
         sc = self.special_char
         l = ['%s=%s'%(k,isinstance(v, basestring) and q(v) or v)
              for k,v in args.items() if v != None ]
@@ -3069,7 +3070,7 @@ def anti_csrf_nonce(self, lifetime=None):
 
     def url_quote(self, url):
         """URL-quote the supplied text."""
-        return urllib.quote(url)
+        return urllib_.quote(url)
 
     def html_quote(self, html):
         """HTML-quote the supplied text."""

roundup/scripts/roundup_server.py

@@ -36,7 +36,7 @@
 # --/
 
 
-import errno, cgi, getopt, os, socket, sys, traceback, urllib, time
+import errno, cgi, getopt, os, socket, sys, traceback, time
 import ConfigParser, BaseHTTPServer, SocketServer, StringIO
 
 try:
@@ -49,6 +49,7 @@
 from roundup import __version__ as roundup_version
 
 # Roundup modules of use here
+from roundup.anypy import urllib_
 from roundup.cgi import cgitb, client
 from roundup.cgi.PageTemplates.PageTemplate import PageTemplate
 import roundup.instance
@@ -248,7 +249,7 @@ def index(self):
         keys = list(self.TRACKER_HOMES.keys())
         if len(keys) == 1:
             self.send_response(302)
-            self.send_header('Location', urllib.quote(keys[0]) + '/index')
+            self.send_header('Location', urllib_.quote(keys[0]) + '/index')
             self.end_headers()
         else:
             self.send_response(200)
@@ -273,7 +274,7 @@ def index(self):
             keys.sort()
             for tracker in keys:
                 w('<li><a href="%(tracker_url)s/index">%(tracker_name)s</a>\n'%{
-                    'tracker_url': urllib.quote(tracker),
+                    'tracker_url': urllib_.quote(tracker),
                     'tracker_name': cgi.escape(tracker)})
             w('</ol></body></html>')
 
@@ -332,7 +333,7 @@ def inner_run_cgi(self):
 
         # figure the tracker
         l_path = rest.split('/')
-        tracker_name = urllib.unquote(l_path[1]).lower()
+        tracker_name = urllib_.unquote(l_path[1]).lower()
 
         # handle missing trailing '/'
         if len(l_path) == 2:
@@ -357,7 +358,7 @@ def inner_run_cgi(self):
         env = {}
         env['TRACKER_NAME'] = tracker_name
         env['REQUEST_METHOD'] = self.command
-        env['PATH_INFO'] = urllib.unquote(rest)
+        env['PATH_INFO'] = urllib_.unquote(rest)
         if query:
             env['QUERY_STRING'] = query
         if self.headers.typeheader is None:

roundup/scripts/roundup_xmlrpc_server.py

@@ -20,7 +20,8 @@
 # --/
 
 
-import base64, getopt, os, sys, socket, urllib
+import base64, getopt, os, sys, socket
+from roundup.anypy import urllib_
 from roundup.xmlrpc import translate
 from roundup.xmlrpc import RoundupInstance
 import roundup.instance
@@ -39,7 +40,7 @@ class RequestHandler(SimpleXMLRPCRequestHandler):
 
     def is_rpc_path_valid(self):
         path = self.path.split('/')
-        name = urllib.unquote(path[1]).lower()
+        name = urllib_.unquote(path[1]).lower()
         return name in self.TRACKER_HOMES
 
     def get_tracker(self, name):
@@ -93,7 +94,7 @@ def do_POST(self):
         db = None
         try:
             path = self.path.split('/')
-            tracker_name = urllib.unquote(path[1]).lower()
+            tracker_name = urllib_.unquote(path[1]).lower()
             tracker = self.get_tracker(tracker_name)
             db = self.authenticate(tracker)
 

scripts/import_sf.py

@@ -21,14 +21,15 @@
 And you're done!
 """
 
-import sys, os, csv, time, urllib2, httplib, mimetypes, urlparse
+import sys, os, csv, time, httplib, mimetypes
 
 try:
     import cElementTree as ElementTree
 except ImportError:
     from elementtree import ElementTree
 
 from roundup import instance, hyperdb, date, support, password
+from roundup.anypy import urllib_
 
 today = date.Date('.')
 
@@ -46,7 +47,7 @@ def get_url(aid):
     # magic "group_id" and "atid" values in it that we need
     assert response.status == 302, 'response code was %s'%response.status
     location = response.getheader('location')
-    query = urlparse.urlparse(response.getheader('location'))[-2]
+    query = urllib_.urlparse(response.getheader('location'))[-2]
     info = dict([param.split('=') for param in query.split('&')])
     return DL_URL%info
 
@@ -91,7 +92,7 @@ def fetch_files(xml_file, file_dir):
             f.write('%s %s\n'%(aid, urls[aid]))
             f.close()
         url = urls[aid] + '&file_id=' + fid
-        f = urllib2.urlopen(url)
+        f = urllib_.urlopen(url)
         data = f.read()
         n = open(os.path.join(file_dir, fid), 'w')
         n.write(data)