summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorPeter Donis <peterdonis@alum.mit.edu>2020-03-26 15:53:16 (GMT)
committerGitHub <noreply@github.com>2020-03-26 15:53:16 (GMT)
commite0b8101492f6c61dee831425b4d3dae39a953599 (patch)
treef734255a1f628628a1788b7d84d5e3bf3f00e8f4 /Misc
parent59c644eaa72b0cc48302f59d66852c4ea8332eba (diff)
downloadcpython-e0b8101492f6c61dee831425b4d3dae39a953599.zip
cpython-e0b8101492f6c61dee831425b4d3dae39a953599.tar.gz
cpython-e0b8101492f6c61dee831425b4d3dae39a953599.tar.bz2
bpo-1812: Fix newline conversion when doctest.testfile loads from a package whose loader has a get_data method (GH-17385)
This pull request fixes the newline conversion bug originally reported in bpo-1812. When that issue was originally submitted, the open builtin did not default to universal newline mode; now it does, which makes the issue fix simpler, since the only code path that needs to be changed is the one in doctest._load_testfile where the file is loaded from a package whose loader has a get_data method.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS.d/next/Tests/2019-11-25-21-46-47.bpo-1812.sAbTbY.rst2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 4e4d090..ce100b9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -421,6 +421,7 @@ Walter Dörwald
Jaromir Dolecek
Zsolt Dollenstein
Brendan Donegan
+Peter Donis
Ismail Donmez
Ray Donnelly
Robert Donohue
diff --git a/Misc/NEWS.d/next/Tests/2019-11-25-21-46-47.bpo-1812.sAbTbY.rst b/Misc/NEWS.d/next/Tests/2019-11-25-21-46-47.bpo-1812.sAbTbY.rst
new file mode 100644
index 0000000..7ffe90d
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-11-25-21-46-47.bpo-1812.sAbTbY.rst
@@ -0,0 +1,2 @@
+Fix newline handling in doctest.testfile when loading from a package whose
+loader has a get_data method. Patch by Peter Donis.