Update doxygen-RST bridge to Python 3

Also remove a debugging print from DocModel.__repr__.

ticket: 8774 (new)
tags: pullup
target_version: 1.17-next

diff --git a/doc/tools/docmodel.py b/doc/tools/docmodel.py
index ef4cd76c31dcd8eb73fec579198f53eef13f52d6..e5d4d11bc0fcc8928171b020d6984565097c0601 100644 (file)
--- a/doc/tools/docmodel.py
+++ b/doc/tools/docmodel.py
@@ -201,7 +201,6 @@ class DocModel(object):
 
     def __repr__(self):
         obj = getattr(self,self.category)
-        print type(obj)
         return str(obj)
 
     def signature(self):
@@ -236,8 +235,8 @@ class DocModelTest(DocModel):
         self.test_save()
 
     def test_print(self):
-        print 'testing'
-        print self
+        print('testing')
+        print(self)
 
 
     def test_save(self):

diff --git a/doc/tools/doxybuilder_funcs.py b/doc/tools/doxybuilder_funcs.py
index bfcadfdf263b3ccafd4ed3cd4a6850fe78f85e29..9a11977aee2215cba5308ed97409f039f354a293 100644 (file)
--- a/doc/tools/doxybuilder_funcs.py
+++ b/doc/tools/doxybuilder_funcs.py
@@ -93,7 +93,7 @@ class DocNode(object):
 
         return '\n'.join(result)
 
-class DoxyContenHandler(object, ContentHandler):
+class DoxyContenHandler(ContentHandler):
     def __init__(self, builder):
         self.builder = builder
         self.counters = defaultdict(int)
@@ -242,7 +242,7 @@ class DoxyFuncs(XML2AST):
                            'description': p_descr}
             parameters.append(param_descr)
         result = Function(**function_descr)
-        print >> self.tmp, result
+        print(result, file=self.tmp)
 
         return function_descr
 

diff --git a/doc/tools/doxybuilder_types.py b/doc/tools/doxybuilder_types.py
index 24e0a57db327d0c85575928b5bf9a3a8c556c23b..947971a94db37faa71ed7673fa070428eefbe2f4 100644 (file)
--- a/doc/tools/doxybuilder_types.py
+++ b/doc/tools/doxybuilder_types.py
@@ -358,7 +358,7 @@ class DoxyBuilderTypes(DoxyTypes):
         result = self.run(filename, include=['typedef'])
         target_dir = '%s/types' % (self.target_dir)
         if not os.path.exists(target_dir):
-            os.makedirs(target_dir, 0755)
+            os.makedirs(target_dir, 0o755)
         for t in result:
             obj = DocModel(**t)
             self.save(obj, self.templates, target_dir)
@@ -369,7 +369,7 @@ class DoxyBuilderTypes(DoxyTypes):
         result = self.run(filename, include=['define'])
         target_dir = '%s/macros' % (self.target_dir)
         if not os.path.exists(target_dir):
-            os.makedirs(target_dir, 0755)
+            os.makedirs(target_dir, 0o755)
         for t in result:
             obj = DocModel(**t)
             tmpl = {'composite': 'define_document.tmpl'}

diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 1fb5fea92752ac97f37c4ba94ad797750f7cc2f9..d635bff9a45888420545ea5c1a884414a0de0969 100644 (file)
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -48,7 +48,7 @@ html: composite
 
 # Dummy target for use in an unconfigured source tree.
 htmlsrc:
-       $(MAKE) -f Makefile.in srcdir=. top_srcdir=.. PYTHON=python html clean
+       $(MAKE) -f Makefile.in srcdir=. top_srcdir=.. PYTHON=python3 html clean
 
 # Create HTML documentation in html_subst suitable for
 # installation by an OS package, with substitutions for configured