summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_calendar.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-09-28 14:48:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-09-28 14:48:40 (GMT)
commite56717c3d201db2dadacd20f654d6be7f9ed18ed (patch)
treee0df9e7bf6ab16052edaa32311ab66278bc73404 /Lib/test/test_calendar.py
parent19f6260710b3d086abcbe400194b203be11b60ab (diff)
parentd8b509b192a67f0f217ae52ed81fc91bc27a1818 (diff)
downloadcpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.zip
cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.gz
cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.bz2
merge heads
Diffstat (limited to 'Lib/test/test_calendar.py')
-rw-r--r--Lib/test/test_calendar.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index d3093ac..7180afe 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -177,7 +177,7 @@ class OutputTestCase(unittest.TestCase):
return not c.isspace() and not c.isdigit()
lines = []
- for line in s.splitlines(False):
+ for line in s.splitlines(keepends=False):
# Drop texts, as they are locale dependent
if line and not filter(neitherspacenordigit, line):
lines.append(line)