summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2018-12-16 09:21:55 -0800
committerJon Dufresne <jon.dufresne@gmail.com>2018-12-16 09:21:55 -0800
commitd414471eed13828421fd5a3b86ac55cd15e2125a (patch)
tree79f952840aedeecc303aa3230985b9585b8e9d9d /sphinx/directives/code.py
parent6461ea233b393abb12a800213e03f12b0b963f3e (diff)
downloadsphinx-git-d414471eed13828421fd5a3b86ac55cd15e2125a.tar.gz
Pass exceptions directly to docutils reporter
The docutils reporter supports an exception as an argument. It is converted to a string internally.
Diffstat (limited to 'sphinx/directives/code.py')
-rw-r--r--sphinx/directives/code.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 77eba1762..3cb3a2d0a 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -14,7 +14,6 @@ from difflib import unified_diff
from docutils import nodes
from docutils.parsers.rst import directives
from docutils.statemachine import StringList
-from six import text_type
from sphinx import addnodes
from sphinx.deprecation import RemovedInSphinx40Warning
@@ -143,7 +142,7 @@ class CodeBlock(SphinxDirective):
hl_lines = [x + 1 for x in hl_lines if x < nlines]
except ValueError as err:
- return [document.reporter.warning(str(err), line=self.lineno)]
+ return [document.reporter.warning(err, line=self.lineno)]
else:
hl_lines = None
@@ -170,7 +169,7 @@ class CodeBlock(SphinxDirective):
try:
literal = container_wrapper(self, literal, caption)
except ValueError as exc:
- return [document.reporter.warning(text_type(exc), line=self.lineno)]
+ return [document.reporter.warning(exc, line=self.lineno)]
# literal will be note_implicit_target that is linked from caption and numref.
# when options['name'] is provided, it should be primary ID.
@@ -465,7 +464,7 @@ class LiteralInclude(SphinxDirective):
return [retnode]
except Exception as exc:
- return [document.reporter.warning(text_type(exc), line=self.lineno)]
+ return [document.reporter.warning(exc, line=self.lineno)]
def setup(app):