summaryrefslogtreecommitdiff
path: root/docutils
diff options
context:
space:
mode:
Diffstat (limited to 'docutils')
-rw-r--r--docutils/utils/error_reporting.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/docutils/utils/error_reporting.py b/docutils/utils/error_reporting.py
index 81df60e46..1e6bf3cbc 100644
--- a/docutils/utils/error_reporting.py
+++ b/docutils/utils/error_reporting.py
@@ -79,7 +79,11 @@ class SafeString(object):
for arg in self.data.args]
return ', '.join(args)
if isinstance(self.data, unicode):
- return self.data.encode(self.encoding, self.encoding_errors)
+ if sys.version_info > (3,0):
+ return self.data
+ else:
+ return self.data.encode(self.encoding,
+ self.encoding_errors)
raise
def __unicode__(self):