diff options
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 9079dcec9..7dc89d39a 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -17,7 +17,7 @@ import inspect import traceback from types import FunctionType, BuiltinFunctionType, MethodType -from six import iterkeys, iteritems, itervalues, text_type, class_types, \ +from six import PY2, iterkeys, iteritems, itervalues, text_type, class_types, \ string_types, StringIO from docutils import nodes from docutils.utils import assemble_option_dict @@ -532,6 +532,8 @@ class Documenter(object): else: errmsg += '; the following exception was raised:\n%s' % \ traceback.format_exc() + if PY2: + errmsg = errmsg.decode('utf-8') dbg(errmsg) self.directive.warn(errmsg) self.env.note_reread() |