summaryrefslogtreecommitdiff
path: root/Lib/string.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-09-28 10:48:40 -0400
committerBenjamin Peterson <benjamin@python.org>2011-09-28 10:48:40 -0400
commite56717c3d201db2dadacd20f654d6be7f9ed18ed (patch)
treee0df9e7bf6ab16052edaa32311ab66278bc73404 /Lib/string.py
parent19f6260710b3d086abcbe400194b203be11b60ab (diff)
parentd8b509b192a67f0f217ae52ed81fc91bc27a1818 (diff)
downloadcpython-git-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.gz
merge heads
Diffstat (limited to 'Lib/string.py')
-rw-r--r--Lib/string.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/string.py b/Lib/string.py
index d4f9cd9355..8bcd1dc6b9 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -84,7 +84,7 @@ class Template(metaclass=_TemplateMetaclass):
def _invalid(self, mo):
i = mo.start('invalid')
- lines = self.template[:i].splitlines(True)
+ lines = self.template[:i].splitlines(keepends=True)
if not lines:
colno = 1
lineno = 1