Use six.text_type to stringify exceptions

On py2, an exception having i18nized message causes UnicodeError on
stringify.  This uses ``six.text_type()`` to stringify them instead.

1 files changed, 3 insertions, 2 deletions

diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 51abc252b..48d87fb93 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -15,6 +15,7 @@ from typing import TYPE_CHECKING
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
 from docutils.statemachine import ViewList
+from six import text_type
 
 from sphinx import addnodes
 from sphinx.locale import __
@@ -159,7 +160,7 @@ class CodeBlock(Directive):
             try:
                 literal = container_wrapper(self, literal, caption)
             except ValueError as exc:
-                return [document.reporter.warning(str(exc), line=self.lineno)]
+                return [document.reporter.warning(text_type(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.
@@ -456,7 +457,7 @@ class LiteralInclude(Directive):
 
             return [retnode]
         except Exception as exc:
-            return [document.reporter.warning(str(exc), line=self.lineno)]
+            return [document.reporter.warning(text_type(exc), line=self.lineno)]
 
 
 def setup(app):