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

Merge branch 'sphinx-python3' into release

This commit is contained in:
Brad King 2014-04-18 09:10:13 -04:00
parent 567e4e681c 69069cfb1a
commit 2b7f70cdcb
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

@ -62,12 +62,12 @@ class CMakeModule(Directive):
settings.record_dependencies.add(path) settings.record_dependencies.add(path)
f = io.FileInput(source_path=path, encoding=encoding, f = io.FileInput(source_path=path, encoding=encoding,
error_handler=e_handler) error_handler=e_handler)
except UnicodeEncodeError, error: except UnicodeEncodeError as error:
raise self.severe('Problems with "%s" directive path:\n' raise self.severe('Problems with "%s" directive path:\n'
'Cannot encode input file path "%s" ' 'Cannot encode input file path "%s" '
'(wrong locale?).' % '(wrong locale?).' %
(self.name, SafeString(path))) (self.name, SafeString(path)))
except IOError, error: except IOError as error:
raise self.severe('Problems with "%s" directive path:\n%s.' % raise self.severe('Problems with "%s" directive path:\n%s.' %
(self.name, ErrorString(error))) (self.name, ErrorString(error)))
raw_lines = f.read().splitlines() raw_lines = f.read().splitlines()
@ -305,7 +305,7 @@ class CMakeDomain(Domain):
contnode, target) contnode, target)
def get_objects(self): 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) yield (refname, refname, type, docname, refname, 1)
def setup(app): def setup(app):

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

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