Fix mixed line endings with pre-commit (#148336)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c77610e209ebbd85a27a83dc33c71e1b6e6076fe..6878a7d92e3beeb00d5dfc1c0c3e37c962a6e336 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -85,6 +85,9 @@ repos:
         exclude: Lib/test/tokenizedata/coding20731.py
       - id: end-of-file-fixer
         files: '^\.github/CODEOWNERS$'
+      - id: mixed-line-ending
+        args: [--fix=auto]
+        exclude: '^Lib/test/.*data/'
       - id: trailing-whitespace
         types_or: [c, inc, python, rst, yaml]
       - id: trailing-whitespace

diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
index 21327b611120a2eb82f955c8e8c9adb8157a7700..927d6035c8c4bc7f0b7515387b4e8977c5728b91 100644 (file)
--- a/Doc/whatsnew/3.15.rst
+++ b/Doc/whatsnew/3.15.rst
@@ -830,9 +830,9 @@ http.server
   is colored by default.
   This can be controlled with :ref:`environment variables
   <using-on-controlling-color>`.
-  (Contributed by Hugo van Kemenade in :gh:`146292`.)\r
-\r
-\r
+  (Contributed by Hugo van Kemenade in :gh:`146292`.)
+
+
 inspect
 -------