From 65f4195ac7a307a8077b5d70d9aa5a8fea1f6590 Mon Sep 17 00:00:00 2001 From: Jean Baptiste Favre Date: Wed, 14 Mar 2018 16:40:34 +0100 Subject: [PATCH] Make documentation build compatible with both Python 2 and 3 Gbp-Pq: Name 0009-fix-doc-python3.patch --- doc/checkvers.py | 14 +++++++------- doc/manpages.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/checkvers.py b/doc/checkvers.py index 0955c20e..77f53ffc 100644 --- a/doc/checkvers.py +++ b/doc/checkvers.py @@ -29,30 +29,30 @@ if __name__ == '__main__': # Check whether we have a recent version of sphinx. EPEL and CentOS are completely crazy and I don't understand their # packaging at all. The test below works on Ubuntu and places where sphinx is installed sanely AFAICT. if options.checkvers: - print 'checking for sphinx version >= 1.2... ', + print ( 'checking for sphinx version >= 1.2... ' ), # Need at least 1.2 because of some command line options stuff HRP added. # Also 1.2 guarantees sphinx.version_info is available. try: import sphinx if 'version_info' in dir(sphinx): - print 'Found Sphinx version {0}'.format(sphinx.version_info) + print ( 'Found Sphinx version {0}'.format(sphinx.version_info) ) else: version = sphinx.__version__ - print 'Found Sphinx version (old) {0}'.format(sphinx.__version__) + print ( 'Found Sphinx version (old) {0}'.format(sphinx.__version__) ) sphinx.version_info = version.split('.') if sphinx.version_info < (1, 2): sys.exit(1) except Exception as e: - print e + print ( e ) sys.exit(1) - print 'checking for sphinx.writers.manpage... ', + print ( 'checking for sphinx.writers.manpage... ' ), try: from sphinx.writers import manpage - print 'yes' + print ( 'yes' ) except Exception as e: - print e + print ( e ) sys.exit(1) diff --git a/doc/manpages.py b/doc/manpages.py index 7b62a257..cd0f682f 100644 --- a/doc/manpages.py +++ b/doc/manpages.py @@ -66,4 +66,4 @@ if __name__ == '__main__': # Print the names of the man pages for the requested manual section. for page in man_pages: if options.section == 0 or options.section == int(page[4][0]): - print page[1] + '.' + page[4] + print( page[1] + '.' + page[4] ) -- 2.30.2