Convert doxygen script to Python 3 and fix doxygen site tool

sconstruct

@@ -83,7 +83,7 @@ env = Environment(variables=vars,HOST_ARCH='x86',tools=[
 	"gettextTool",
 	"t2t"
 	,keyCommandsDocTool,
-	#"doxygen",
+	"doxygen",
 	"recursiveInstall"
 ])
 
@@ -372,10 +372,10 @@ def makePot(target, source, env):
 	os.remove(potFn)
 	os.rename(tmpFn, potFn)
 
-#devDocs_nvdaHelper_temp=env.Doxygen(source='nvdaHelper/doxyfile')
-#devDocs_nvdaHelper=env.Command(devDocsOutputDir.Dir('nvdaHelper'),devDocs_nvdaHelper_temp,Move('$TARGET','$SOURCE'))
-#env.Alias('devDocs_nvdaHelper', devDocs_nvdaHelper)
-#env.Clean('devDocs_nvdaHelper', devDocs_nvdaHelper)
+devDocs_nvdaHelper_temp=env.Doxygen(source='nvdaHelper/doxyfile')
+devDocs_nvdaHelper=env.Command(devDocsOutputDir.Dir('nvdaHelper'),devDocs_nvdaHelper_temp,Move('$TARGET','$SOURCE'))
+env.Alias('devDocs_nvdaHelper', devDocs_nvdaHelper)
+env.Clean('devDocs_nvdaHelper', devDocs_nvdaHelper)
 
 #devDocs_nvda = env.Command(devDocsOutputDir.Dir("nvda"), None, [[
 #	"cd", sourceDir.path, "&&",

site_scons/site_tools/doxygen.py

@@ -23,10 +23,8 @@
 import os.path
 import glob
 from fnmatch import fnmatch
-try:
-	import _winreg as winreg # Python 2.7 import
-except:
-	import winreg # python 3 import
+from functools import reduce
+import winreg
 
 def fetchDoxygenPath():
 	try:
@@ -74,7 +72,7 @@ def append_data(data, key, new_data, token):
          key_token = False
       else:
          if token == "+=":
-            if not data.has_key(key):
+            if key not in data:
                data[key] = list()
          elif token == "=":
             data[key] = list()
@@ -90,7 +88,8 @@ def append_data(data, key, new_data, token):
          append_data( data, key, new_data, '\\' )
 
    # compress lists of len 1 into single strings
-   for (k, v) in data.items():
+   # Wrap items into a list, since we're mutating the dictionary
+   for (k, v) in list(data.items()):
       if len(v) == 0:
          data.pop(k)
 
@@ -121,7 +120,8 @@ def DoxySourceScan(node, env, path):
 
    sources = []
 
-   data = DoxyfileParse(node.get_contents())
+   with open(node.abspath) as contents:
+      data = DoxyfileParse(contents)
 
    if data.get("RECURSIVE", "NO") == "YES":
       recursive = True
@@ -149,7 +149,7 @@ def DoxySourceScan(node, env, path):
             for pattern in file_patterns:
                sources.extend(glob.glob("/".join([node, pattern])))
 
-   sources = map( lambda path: env.File(path), sources )
+   sources = [env.File(path) for path in sources]
    return sources
 
 
@@ -168,13 +168,14 @@ def DoxyEmitter(source, target, env):
       "XML": ("NO", "xml"),
    }
 
-   data = DoxyfileParse(source[0].get_contents())
+   with open(source[0].abspath) as contents:
+      data = DoxyfileParse(contents)
 
    targets = []
    out_dir = source[0].Dir(data.get("OUTPUT_DIRECTORY", "."))
 
    # add our output locations
-   for (k, v) in output_formats.items():
+   for (k, v) in list(output_formats.items()):
       if data.get("GENERATE_" + k, v[0]) == "YES":
          targets.append(out_dir.Dir(v[1]))