[3.12] gh-105017: Fix including additional NL token when using CRLF (GH-105022) (#105023)

miss-islington · mgmacias95 · pablogsal · web-flow · commit 2b176bc90269 · 2023-05-27T18:24:30.000+01:00
Co-authored-by: Marta Gómez Macías &lt;mgmacias@google.com&gt;
Co-authored-by: Pablo Galindo Salgado &lt;Pablogsal@gmail.com&gt;
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
@@ -84,6 +84,14 @@ def test_basic(self):
     NEWLINE    '\\n'          (4, 26) (4, 27)
     DEDENT     ''            (5, 0) (5, 0)
     """)
+
+        self.check_tokenize("foo='bar'\r\n", """\
+    NAME       'foo'         (1, 0) (1, 3)
+    OP         '='           (1, 3) (1, 4)
+    STRING     "'bar'"       (1, 4) (1, 9)
+    NEWLINE    '\\n'          (1, 9) (1, 10)
+            """)
+
         indent_error_file = b"""\
 def k(x):
     x += 2
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-05-27-16-23-16.gh-issue-105017.KQrsC0.rst b/Misc/NEWS.d/next/Core and Builtins/2023-05-27-16-23-16.gh-issue-105017.KQrsC0.rst
@@ -0,0 +1 @@
+Do not include an additional final ``NL`` token when parsing files having CRLF lines. Patch by Marta Gómez.
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -800,7 +800,7 @@ translate_newlines(const char *s, int exec_input, struct tok_state *tok) {
     }
     /* If this is exec input, add a newline to the end of the string if
        there isn't one already. */
-    if (exec_input && c != '\n') {
+    if (exec_input && c != '\n' && c != '\0') {
         *current = '\n';
         current++;
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Do not include an additional final ``NL`` token when parsing files having CRLF lines. Patch by Marta Gómez.
Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,7 @@ translate_newlines(const char s, int exec_input, struct tok_state tok) {`
`800`	`800`	`}`
`801`	`801`	`/* If this is exec input, add a newline to the end of the string if`
`802`	`802`	`there isn't one already. */`
`803`		`- if (exec_input && c != '\n') {`
	`803`	`+ if (exec_input && c != '\n' && c != '\0') {`
`804`	`804`	`*current = '\n';`
`805`	`805`	`current++;`
`806`	`806`	`}`