Merge branch 'master' into sip-4.16

build.py

@@ -501,7 +501,7 @@ def getTool(cmdName, version, MD5, envVar, platformBinary):
                 try:
                     p = subprocess.Popen([cmd, '--help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ)
                     p.wait()
-                except OSError, e:
+                except OSError as e:
                     print('ERROR: Could not execute %s, got "%s"' % (cmd, e))
                     print('       Set %s in the environment to use a local build of %s instead' % (envVar, cmdName))
                     sys.exit(1)

etgtools/sphinx_generator.py

@@ -1960,7 +1960,7 @@ class XMLDocString(object):
         else:
             raise Exception('Unhandled docstring kind for %s'%xml_item.__class__.__name__)
 
-        if hasattr(xml_item, 'deprecated') and xml_item.deprecated and isinstance(xml_item.deprecated, basestring):
+        if hasattr(xml_item, 'deprecated') and xml_item.deprecated and isinstance(xml_item.deprecated, string_base):
             element = et.Element('deprecated', kind='deprecated')
             element.text = VERSION
             
@@ -2610,7 +2610,7 @@ class XMLDocString(object):
 
         if hasattr(method, 'deprecated') and method.deprecated:
             text = method.deprecated
-            if isinstance(text, basestring):
+            if isinstance(text, string_base):
                 text = '%s %s\n%s%s\n\n'%('      .. deprecated::', VERSION, ' '*9, text.replace('\n', ' '))
                 stream.write(text)
 

sphinxtools/utilities.py

@@ -301,7 +301,7 @@ def PythonizeType(ptype, is_param):
 
     else:
         if is_param and '.' in ptype:
-            modules = MODULENAME_REPLACE.values()
+            modules = list(MODULENAME_REPLACE.values())
             modules.sort()
             modules = modules[1:]
             if ptype.split('.')[0] + '.' in modules: