From c3db6e5bc849805d87b3b105c249d2709a17a6ad Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 3 Nov 2016 13:10:22 -0700 Subject: [PATCH] Python 3 fixes --- autoapi/mappers/python.py | 5 ++--- autoapi/toctree.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/autoapi/mappers/python.py b/autoapi/mappers/python.py index 9463bf5..cf5639f 100644 --- a/autoapi/mappers/python.py +++ b/autoapi/mappers/python.py @@ -1,6 +1,5 @@ import sys import os -import re import textwrap import ast from collections import defaultdict @@ -174,8 +173,8 @@ class PythonPythonMapper(PythonMapperBase): # exceptions, including SyntaxError try: parsed = ast.parse(source) - except Exception, e: # noqa - print "Error parsing AST: %s" % str(e) + except Exception as e: # noqa + print("Error parsing AST: %s" % str(e)) return [] parsed_args = parsed.body[0].args arg_names = [arg.id if sys.version_info < (3,) else arg.arg diff --git a/autoapi/toctree.py b/autoapi/toctree.py index e171531..134c427 100644 --- a/autoapi/toctree.py +++ b/autoapi/toctree.py @@ -78,8 +78,12 @@ def _get_toc_reference(node, toc, docname): toc_reference = _find_toc_node(toc, ref_id, nodes.section) else: # Desc node - ref_id = node.children[0].attributes['ids'][0] - toc_reference = _find_toc_node(toc, ref_id, addnodes.desc) + try: + ref_id = node.children[0].attributes['ids'][0] + toc_reference = _find_toc_node(toc, ref_id, addnodes.desc) + except IndexError as e: + print('Invalid desc node: %s' % e) + toc_reference = None return toc_reference @@ -108,8 +112,8 @@ def add_domain_to_toctree(app, doctree, docname): for desc_node in doctree.traverse(addnodes.desc): try: ref_id = desc_node.children[0].attributes['ids'][0] - except IndexError, e: - print 'Invalid desc node: %s' % e + except IndexError as e: + print('Invalid desc node: %s' % e) continue try: # Python domain object