Merge #11488 patch from 3.2.
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index cf8fc33..2d29885 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -704,6 +704,23 @@
f.write(b'x')
self.assertTrue(f._rolled)
+ def test_writelines(self):
+ # Verify writelines with a SpooledTemporaryFile
+ f = self.do_create()
+ f.writelines((b'x', b'y', b'z'))
+ f.seek(0)
+ buf = f.read()
+ self.assertEqual(buf, b'xyz')
+
+ def test_writelines_sequential(self):
+ # A SpooledTemporaryFile should hold exactly max_size bytes, and roll
+ # over afterward
+ f = self.do_create(max_size=35)
+ f.writelines((b'x' * 20, b'x' * 10, b'x' * 5))
+ self.assertFalse(f._rolled)
+ f.write(b'x')
+ self.assertTrue(f._rolled)
+
def test_sparse(self):
# A SpooledTemporaryFile that is written late in the file will extend
# when that occurs
diff --git a/Misc/ACKS b/Misc/ACKS
index 1dc4063..1abfa26 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -197,6 +197,7 @@
Lisandro Dalcin
Andrew Dalke
Lars Damerow
+Evan Dandrea
Eric Daniel
Scott David Daniels
Ben Darnell