diff options
| -rw-r--r-- | Utilities/Sphinx/cmake.py | 6 | ||||
| -rw-r--r-- | Utilities/Sphinx/conf.py.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py index 336c74a..5eb4eac 100644 --- a/Utilities/Sphinx/cmake.py +++ b/Utilities/Sphinx/cmake.py @@ -62,12 +62,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() @@ -305,7 +305,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): diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in index ef622fd..e334389 100644 --- a/Utilities/Sphinx/conf.py.in +++ b/Utilities/Sphinx/conf.py.in @@ -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 |