summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_nntplib.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_nntplib.py
parent19f6260710b3d086abcbe400194b203be11b60ab (diff)
parentd8b509b192a67f0f217ae52ed81fc91bc27a1818 (diff)
downloadcpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.zip
cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.gz
cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.bz2
merge heads
Diffstat (limited to 'Lib/test/test_nntplib.py')
-rw-r--r--Lib/test/test_nntplib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index ec790ad..d8e6332 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -1033,12 +1033,12 @@ class NNTPv1v2TestsMixin:
self.assertEqual(resp, success_resp)
# With an iterable of terminated lines
def iterlines(b):
- return iter(b.splitlines(True))
+ return iter(b.splitlines(keepends=True))
resp = self._check_post_ihave_sub(func, *args, file_factory=iterlines)
self.assertEqual(resp, success_resp)
# With an iterable of non-terminated lines
def iterlines(b):
- return iter(b.splitlines(False))
+ return iter(b.splitlines(keepends=False))
resp = self._check_post_ihave_sub(func, *args, file_factory=iterlines)
self.assertEqual(resp, success_resp)