mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 22:54:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #1729305: Fix doctest to handle encode error with "backslashreplace". It fixes #7667 too.

Browse source
This commit is contained in:
Florent Xicluna 2010-02-27 13:31:23 +00:00
parent 0263da547e
commit 2a903b26e9
3 changed files with 55 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/doctest.py
View file

@ -218,11 +218,18 @@ def _load_testfile(filename, package, module_relative):
return file_contents.replace(os.linesep, '\n'), filename
return open(filename).read(), filename
# Use sys.stdout encoding for ouput.
_encoding = getattr(sys.__stdout__, 'encoding', None) or 'utf-8'
def _indent(s, indent=4):
"""
Add the given number of space characters to the beginning every
non-blank line in `s`, and return the result.
Add the given number of space characters to the beginning of
every non-blank line in `s`, and return the result.
If the string `s` is Unicode, it is encoded using the stdout
encoding and the `backslashreplace` error handler.
"""
if isinstance(s, unicode):
s = s.encode(_encoding, 'backslashreplace')
# This regexp matches the start of non-blank lines:
return re.sub('(?m)^(?!$)', indent*' ', s)