Raise an error on carriage return in multi-line basic string

hukkin · Jul 30, 2021 · 8b8be54 · 8b8be54
1 parent 1b35b36
commit 8b8be54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## **unreleased**
+
+- Fixed
+  - Raise an error if a carriage return (without a following line feed) is found in a multi-line basic string
+
 ## 1.2.0
 
 - Deprecated

diff --git a/tests/data/extras/invalid/multiline-basic-str/carriage-return.toml b/tests/data/extras/invalid/multiline-basic-str/carriage-return.toml
@@ -0,0 +1,2 @@
+s="""cr is not an allowed line endingbut we just tried to use it
+"""

diff --git a/tomli/_parser.py b/tomli/_parser.py
@@ -27,10 +27,10 @@
 # Neither of these sets include quotation mark or backslash. They are
 # currently handled as separate cases in the parser functions.
 ILLEGAL_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t")
-ILLEGAL_MULTILINE_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t\n\r")
+ILLEGAL_MULTILINE_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t\n")
 
 ILLEGAL_LITERAL_STR_CHARS = ILLEGAL_BASIC_STR_CHARS
-ILLEGAL_MULTILINE_LITERAL_STR_CHARS = ASCII_CTRL - frozenset("\t\n")
+ILLEGAL_MULTILINE_LITERAL_STR_CHARS = ILLEGAL_MULTILINE_BASIC_STR_CHARS
 
 ILLEGAL_COMMENT_CHARS = ILLEGAL_BASIC_STR_CHARS