From: Greg Hudson Date: Thu, 17 Jan 2019 17:51:59 +0000 (-0500) Subject: Update doxygen-RST bridge to Python 3 X-Git-Tag: krb5-1.18-beta1~193 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F892%2Fhead;p=thirdparty%2Fkrb5.git 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 ef4cd76c31..e5d4d11bc0 100644 --- 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 bfcadfdf26..9a11977aee 100644 --- 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 24e0a57db3..947971a94d 100644 --- 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 1fb5fea927..d635bff9a4 100644 --- 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