summaryrefslogtreecommitdiff
path: root/sphinx/util
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-01-29 10:00:28 +0100
committerGeorg Brandl <georg@python.org>2012-01-29 10:00:28 +0100
commit8859aff3b4cc51de99f577cf4138b53fcdf31ff8 (patch)
tree9b3d37e131d50ef347d7a44176d336f0503ae75d /sphinx/util
parentee92f4411961085ec6fb0af7757e13f4ebfe0a33 (diff)
downloadsphinx-8859aff3b4cc51de99f577cf4138b53fcdf31ff8.tar.gz
PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII characters correctly.
Diffstat (limited to 'sphinx/util')
-rw-r--r--sphinx/util/inspect.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index ff6c222d..f5c8911d 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.py
@@ -15,6 +15,8 @@ import sys
# relatively import this module
inspect = __import__('inspect')
+from sphinx.util import force_decode
+
if sys.version_info >= (2, 5):
from functools import partial
@@ -87,4 +89,4 @@ def safe_repr(object):
s = repr(object)
except Exception:
raise ValueError
- return s.replace('\n', ' ')
+ return force_decode(s, None).replace('\n', ' ')