Skip to content

Fix CRLF being counted as two line breaks with preserve_blank_lines #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afonsojanu wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Fix CRLF being counted as two line breaks with preserve_blank_lines #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion titlecase/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def titlecase(text, callback=None, small_first_last=True, preserve_blank_lines=F

"""
if preserve_blank_lines:
lines = regex.split('[\r\n]', text)
lines = regex.split(r'\r\n|\r|\n', text)
else:
lines = regex.split('[\r\n]+', text)
processed = []
Expand Down
11 changes: 11 additions & 0 deletions titlecase/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,17 @@ def test_complex_blanks(self):
self.assertEqual(titlecase(s, preserve_blank_lines=True),
'\n\nLeading Blank\n\n\nMulti-Blank\n\n\n\n\nTrailing Blank\n\n')

def test_crlf_line_endings(self):
# A CRLF is a single line ending, not two, so it shouldn't introduce
# extra blank lines when preserve_blank_lines is on.
self.assertEqual(titlecase('a\r\nb', preserve_blank_lines=True), 'A\nB')
self.assertEqual(titlecase('Line1\r\nLine2\r\nLine3', preserve_blank_lines=True),
'Line1\nLine2\nLine3')
self.assertEqual(titlecase('Line1\r\n\r\nLine2', preserve_blank_lines=True),
'Line1\n\nLine2')
# Lone CR line endings should behave the same way as LF ones.
self.assertEqual(titlecase('a\rb', preserve_blank_lines=True), 'A\nB')

class TestNormaliseSpaceCharacters(unittest.TestCase):
def test_tabs(self):
s = 'text\twith\ttabs'
Expand Down