diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | sphinx/util/inspect.py | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Release 1.1.3 (in development) +============================== + +* PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII + characters correctly. + + Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway! ====================================================================== 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', ' ') |