Python2/3 compat - urllib

[joerg]

docs/tools/dump_ast_matchers.py

11

Missing follow-up change in the rest of the file.

[serge-sans-paille]

Thanks for spotting that, I messed up during the (huge) git add -p session :p

[michaelplatings]

tools/scan-view/bin/scan-view

15

Python 3's urlopen is equivalent to urllib2.urlopen not urllib.urlopen so I recommend importing from urllib2 instead.

[michaelplatings]

tools/scan-view/bin/scan-view

15

This should be the same as dump_ast_matchers.py i.e.:

try:
    from urllib.request import urlopen
except ImportError:
    from urllib2 import urlopen

[michaelplatings]

tools/scan-view/bin/scan-view

15

This still isn't done.

[serge-sans-paille]

Sorry for the noise :-/

[michaelplatings]

LGTM

docs/tools/dump_ast_matchers.py

 
 import collections
 import re
-import urllib2
+try:
+    from urllib.request import urlopen
+except ImportError:
+    from urllib2 import urlopen
 
 MATCHERS_FILE = '../../include/clang/ASTMatchers/ASTMatchers.h'
 

     if url not in doxygen_probes:
       try:
         print('Probing %s...' % url)
-        urlib2.urlopen(url)
+        urlopen(url)
         doxygen_probes[url] = True
       except:
         doxygen_probes[url] = False

docs/tools/dump_format_style.py

 import collections
 import os
 import re
-import urllib2
 
 CLANG_DIR = os.path.join(os.path.dirname(__file__), '../..')
 FORMAT_STYLE_FILE = os.path.join(CLANG_DIR, 'include/clang/Format/Format.h')

tools/scan-view/bin/scan-view

 import posixpath
 import thread
 import time
-import urllib
+try:
+    from urllib import urlopen
+except ImportError:
+    from urllib.request import urlopen
 import webbrowser
 
 # How long to wait for server to start.

 
 def url_is_up(url):
     try:
-        o = urllib.urlopen(url)
+        o = urlopen(url)
     except IOError:
         return False
     o.close()

 
 
 def start_browser(port, options):
-    import urllib
     import webbrowser
 
     url = 'http://%s:%d' % (options.host, port)

tools/scan-view/share/ScanView.py

     from SimpleHTTPServer import SimpleHTTPRequestHandler
 import os
 import sys
-import urllib, urlparse
+try:
+    from urlparse import urlparse
+    from urllib import unquote
+except ImportError:
+    from urllib.parse import urlparse, unquote
+
 import posixpath
 
 from io import StringIO, BytesIO

             value = ''
         else:
             name, value = chunk.split('=', 1)
-        name = urllib.unquote(name.replace('+', ' '))
-        value = urllib.unquote(value.replace('+', ' '))
+        name = unquote(name.replace('+', ' '))
+        value = unquote(value.replace('+', ' '))
         item = fields.get(name)
         if item is None:
             fields[name] = [value]

             fields = {}
         self.fields = fields
 
-        o = urlparse.urlparse(self.path)
+        o = urlparse(self.path)
         self.fields = parse_query(o.query, fields)
-        path = posixpath.normpath(urllib.unquote(o.path))
+        path = posixpath.normpath(unquote(o.path))
 
         # Split the components and strip the root prefix.
         components = path.split('/')[1:]