mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
PR#40: Fix `safe_repr
` function to decode bytestrings with non-ASCII characters correctly.
This commit is contained in:
parent
ff06931381
commit
00ed3ae8a9
7
CHANGES
7
CHANGES
@ -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!
|
Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ import sys
|
|||||||
# relatively import this module
|
# relatively import this module
|
||||||
inspect = __import__('inspect')
|
inspect = __import__('inspect')
|
||||||
|
|
||||||
|
from sphinx.util import force_decode
|
||||||
|
|
||||||
|
|
||||||
if sys.version_info >= (2, 5):
|
if sys.version_info >= (2, 5):
|
||||||
from functools import partial
|
from functools import partial
|
||||||
@ -87,4 +89,4 @@ def safe_repr(object):
|
|||||||
s = repr(object)
|
s = repr(object)
|
||||||
except Exception:
|
except Exception:
|
||||||
raise ValueError
|
raise ValueError
|
||||||
return s.replace('\n', ' ')
|
return force_decode(s, None).replace('\n', ' ')
|
||||||
|
Loading…
Reference in New Issue
Block a user