kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'sphinx-python3' 

69069cfb Utilities/Sphinx: Port documentation generation to python3 (#14886)
This commit is contained in:
Brad King 2014-04-18 09:08:28 -04:00 committed by CMake Topic Stage
parent c9d13f841e 69069cfb1a
commit e0790c90c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/Sphinx/cmake.py
View File

@ -80,12 +80,12 @@ class CMakeModule(Directive):
settings.record_dependencies.add(path)
f = io.FileInput(source_path=path, encoding=encoding,
error_handler=e_handler)
except UnicodeEncodeError, error:
except UnicodeEncodeError as error:
raise self.severe('Problems with "%s" directive path:\n'
'Cannot encode input file path "%s" '
'(wrong locale?).' %
(self.name, SafeString(path)))
except IOError, error:
except IOError as error:
raise self.severe('Problems with "%s" directive path:\n%s.' %
(self.name, ErrorString(error)))
raw_lines = f.read().splitlines()
@ -323,7 +323,7 @@ class CMakeDomain(Domain):
contnode, target)
def get_objects(self):
for refname, (docname, type) in self.data['objects'].iteritems():
for refname, (docname, type) in self.data['objects'].items():
yield (refname, refname, type, docname, refname, 1)
def setup(app):

2
Utilities/Sphinx/conf.py.in
View File

@ -50,7 +50,7 @@ for fpath in cmake_manuals:
name, desc, [], int(sec)))
else:
sys.stderr.write("ERROR: No cmake-manual-description in '%s'\n" % fpath)
except Exception, e:
except Exception as e:
sys.stderr.write("ERROR: %s\n" % str(e))
man_show_urls = False