From: Peter Donis <peterdonis@alum.mit.edu>
Date: Tue, 2 Mar 2021 17:06:20 +0000 (-0500)
Subject: bpo-43049: Use io.IncrementalNewlineDecoder for doctest newline conversion (GH-24359)
X-Git-Tag: v3.10.0a7~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b36349a647b2bf8174f0e736a4fc347e92ae204e;p=thirdparty%2FPython%2Fcpython.git

bpo-43049: Use io.IncrementalNewlineDecoder for doctest newline conversion (GH-24359)

Followup to bpo-1812 and GH-17385.
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 5bb35c9715d1..e95c333f48aa 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -102,7 +102,7 @@ import re
 import sys
 import traceback
 import unittest
-from io import StringIO
+from io import StringIO, IncrementalNewlineDecoder
 from collections import namedtuple
 
 TestResults = namedtuple('TestResults', 'failed attempted')
@@ -212,11 +212,8 @@ def _normalize_module(module, depth=2):
         raise TypeError("Expected a module, string, or None")
 
 def _newline_convert(data):
-    # We have two cases to cover and we need to make sure we do
-    # them in the right order
-    for newline in ('\r\n', '\r'):
-        data = data.replace(newline, '\n')
-    return data
+    # The IO module provides a handy decoder for universal newline conversion
+    return IncrementalNewlineDecoder(None, True).decode(data, True)
 
 def _load_testfile(filename, package, module_relative, encoding):
     if module_relative: