mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

(Merge 3.4) Issue #21398: Fix an unicode error in the pydoc pager when the

Browse source 
documentation contains characters not encodable to the stdout encoding.
This commit is contained in:
Victor Stinner 2014-05-13 02:06:33 +02:00
commit 38d3d22b29
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/pydoc.py
View file

@ -1404,6 +1404,9 @@ class _PlainTextDoc(TextDoc):
def pager(text): def pager(text):
"""The first time this is called, determine what kind of pager to use.""" """The first time this is called, determine what kind of pager to use."""
global pager global pager
# Escape non-encodable characters to avoid encoding errors later
encoding = sys.getfilesystemencoding()
text = text.encode(encoding, 'backslashreplace').decode(encoding)
pager = getpager() pager = getpager()
pager(text) pager(text)

3
Misc/NEWS
View file

@ -84,6 +84,9 @@ Core and Builtins
Library Library
------- -------
- Issue #21398: Fix an unicode error in the pydoc pager when the documentation
contains characters not encodable to the stdout encoding.
- Issue #16531: ipaddress.IPv4Network and ipaddress.IPv6Network now accept - Issue #16531: ipaddress.IPv4Network and ipaddress.IPv6Network now accept
an (address, netmask) tuple argument, so as to easily construct network an (address, netmask) tuple argument, so as to easily construct network
objects from existing addresses. objects from existing addresses.