https://github.com/python/cpython/commit/66ba1c7cce7c56b8c1f33865e1d60e9121bbd396
commit: 66ba1c7cce7c56b8c1f33865e1d60e9121bbd396
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: hugovk <[email protected]>
date: 2026-04-19T09:44:16Z
summary:

[3.13] Prevent GitHub's web conflict editor from converting LF to CRLF 
(GH-148739) (#148749)

Co-authored-by: Hugo van Kemenade <[email protected]>

files:
M .gitattributes
M 
Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst

diff --git a/.gitattributes b/.gitattributes
index eca25b6050cdb9..bc9328a2b05875 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,6 +33,9 @@ Lib/test/xmltestdata/*                     noeol
 Lib/venv/scripts/common/activate text eol=lf
 Lib/venv/scripts/posix/* text eol=lf
 
+# Prevent GitHub's web conflict editor from converting LF to CRLF
+*.rst text eol=lf
+
 # CRLF files
 [attr]dos text eol=crlf
 
diff --git 
a/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
 
b/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
index bc61cc43a5aa33..1c2e06c86f6588 100644
--- 
a/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
+++ 
b/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
@@ -1,2 +1,2 @@
-Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
-that calls :func:`next` on the same reader from within ``__next__``.
+Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
+that calls :func:`next` on the same reader from within ``__next__``.

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to