2007-02-27 13:19:33 -04:00
|
|
|
"""Unit tests for io.py."""
|
|
|
|
|
2007-08-18 18:39:55 -03:00
|
|
|
import os
|
2007-04-10 17:08:41 -03:00
|
|
|
import sys
|
2007-04-11 13:07:50 -03:00
|
|
|
import time
|
2007-04-12 02:44:49 -03:00
|
|
|
import array
|
2008-08-14 19:44:29 -03:00
|
|
|
import threading
|
|
|
|
import random
|
2007-02-27 01:47:44 -04:00
|
|
|
import unittest
|
2008-08-14 19:44:29 -03:00
|
|
|
from itertools import chain, cycle
|
2008-05-20 18:35:26 -03:00
|
|
|
from test import support
|
2007-04-06 16:10:29 -03:00
|
|
|
|
2008-03-18 01:51:32 -03:00
|
|
|
import codecs
|
2007-04-10 16:01:47 -03:00
|
|
|
import io # The module under test
|
2007-02-27 01:47:44 -04:00
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
class MockRawIO(io.RawIOBase):
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
def __init__(self, read_stack=()):
|
|
|
|
self._read_stack = list(read_stack)
|
|
|
|
self._write_stack = []
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def read(self, n=None):
|
|
|
|
try:
|
2007-04-06 16:10:29 -03:00
|
|
|
return self._read_stack.pop(0)
|
2007-02-27 13:19:33 -04:00
|
|
|
except:
|
2007-04-06 14:31:18 -03:00
|
|
|
return b""
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def write(self, b):
|
2007-04-06 16:10:29 -03:00
|
|
|
self._write_stack.append(b[:])
|
2007-03-06 21:00:12 -04:00
|
|
|
return len(b)
|
|
|
|
|
|
|
|
def writable(self):
|
|
|
|
return True
|
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
def fileno(self):
|
|
|
|
return 42
|
|
|
|
|
|
|
|
def readable(self):
|
|
|
|
return True
|
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def seekable(self):
|
2007-02-27 13:19:33 -04:00
|
|
|
return True
|
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def seek(self, pos, whence):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def tell(self):
|
2007-02-27 13:19:33 -04:00
|
|
|
return 42
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-06 14:31:18 -03:00
|
|
|
class MockFileIO(io.BytesIO):
|
|
|
|
|
|
|
|
def __init__(self, data):
|
|
|
|
self.read_history = []
|
|
|
|
io.BytesIO.__init__(self, data)
|
|
|
|
|
|
|
|
def read(self, n=None):
|
|
|
|
res = io.BytesIO.read(self, n)
|
|
|
|
self.read_history.append(None if res is None else len(res))
|
|
|
|
return res
|
|
|
|
|
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
class MockNonBlockWriterIO(io.RawIOBase):
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
def __init__(self, blocking_script):
|
|
|
|
self._blocking_script = list(blocking_script)
|
2007-03-06 21:00:12 -04:00
|
|
|
self._write_stack = []
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def write(self, b):
|
2007-04-06 16:10:29 -03:00
|
|
|
self._write_stack.append(b[:])
|
2007-04-10 16:01:47 -03:00
|
|
|
n = self._blocking_script.pop(0)
|
2007-03-06 21:00:12 -04:00
|
|
|
if (n < 0):
|
2007-04-09 21:22:16 -03:00
|
|
|
raise io.BlockingIOError(0, "test blocking", -n)
|
2007-03-06 21:00:12 -04:00
|
|
|
else:
|
|
|
|
return n
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def writable(self):
|
|
|
|
return True
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-02-27 01:47:44 -04:00
|
|
|
class IOTest(unittest.TestCase):
|
|
|
|
|
2008-03-24 03:18:09 -03:00
|
|
|
def setUp(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(support.TESTFN)
|
2008-03-24 03:18:09 -03:00
|
|
|
|
2007-03-07 18:59:39 -04:00
|
|
|
def tearDown(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(support.TESTFN)
|
2007-03-07 18:59:39 -04:00
|
|
|
|
2007-02-27 01:47:44 -04:00
|
|
|
def write_ops(self, f):
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.write(b"blah."), 5)
|
|
|
|
self.assertEqual(f.seek(0), 0)
|
|
|
|
self.assertEqual(f.write(b"Hello."), 6)
|
2007-02-27 01:47:44 -04:00
|
|
|
self.assertEqual(f.tell(), 6)
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.seek(-1, 1), 5)
|
2007-02-27 01:47:44 -04:00
|
|
|
self.assertEqual(f.tell(), 5)
|
2007-11-21 15:29:53 -04:00
|
|
|
self.assertEqual(f.write(bytearray(b" world\n\n\n")), 9)
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.seek(0), 0)
|
2007-05-08 17:18:39 -03:00
|
|
|
self.assertEqual(f.write(b"h"), 1)
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.seek(-1, 2), 13)
|
|
|
|
self.assertEqual(f.tell(), 13)
|
|
|
|
self.assertEqual(f.truncate(12), 12)
|
2008-05-06 16:48:38 -03:00
|
|
|
self.assertEqual(f.tell(), 12)
|
2007-11-08 14:04:45 -04:00
|
|
|
self.assertRaises(TypeError, f.seek, 0.0)
|
2007-02-27 01:47:44 -04:00
|
|
|
|
2007-04-10 22:09:03 -03:00
|
|
|
def read_ops(self, f, buffered=False):
|
|
|
|
data = f.read(5)
|
|
|
|
self.assertEqual(data, b"hello")
|
2007-11-21 15:29:53 -04:00
|
|
|
data = bytearray(data)
|
2007-04-10 22:09:03 -03:00
|
|
|
self.assertEqual(f.readinto(data), 5)
|
|
|
|
self.assertEqual(data, b" worl")
|
|
|
|
self.assertEqual(f.readinto(data), 2)
|
|
|
|
self.assertEqual(len(data), 5)
|
|
|
|
self.assertEqual(data[:2], b"d\n")
|
|
|
|
self.assertEqual(f.seek(0), 0)
|
|
|
|
self.assertEqual(f.read(20), b"hello world\n")
|
|
|
|
self.assertEqual(f.read(1), b"")
|
2007-11-21 15:29:53 -04:00
|
|
|
self.assertEqual(f.readinto(bytearray(b"x")), 0)
|
2007-04-10 22:09:03 -03:00
|
|
|
self.assertEqual(f.seek(-6, 2), 6)
|
|
|
|
self.assertEqual(f.read(5), b"world")
|
|
|
|
self.assertEqual(f.read(0), b"")
|
2007-11-21 15:29:53 -04:00
|
|
|
self.assertEqual(f.readinto(bytearray()), 0)
|
2007-04-10 22:09:03 -03:00
|
|
|
self.assertEqual(f.seek(-6, 1), 5)
|
|
|
|
self.assertEqual(f.read(5), b" worl")
|
|
|
|
self.assertEqual(f.tell(), 10)
|
2007-11-08 14:04:45 -04:00
|
|
|
self.assertRaises(TypeError, f.seek, 0.0)
|
2007-04-10 22:09:03 -03:00
|
|
|
if buffered:
|
|
|
|
f.seek(0)
|
|
|
|
self.assertEqual(f.read(), b"hello world\n")
|
|
|
|
f.seek(6)
|
|
|
|
self.assertEqual(f.read(), b"world\n")
|
|
|
|
self.assertEqual(f.read(), b"")
|
|
|
|
|
2007-04-10 17:08:41 -03:00
|
|
|
LARGE = 2**31
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
def large_file_ops(self, f):
|
|
|
|
assert f.readable()
|
|
|
|
assert f.writable()
|
2007-04-10 17:08:41 -03:00
|
|
|
self.assertEqual(f.seek(self.LARGE), self.LARGE)
|
|
|
|
self.assertEqual(f.tell(), self.LARGE)
|
2007-04-10 16:01:47 -03:00
|
|
|
self.assertEqual(f.write(b"xxx"), 3)
|
2007-04-10 17:08:41 -03:00
|
|
|
self.assertEqual(f.tell(), self.LARGE + 3)
|
|
|
|
self.assertEqual(f.seek(-1, 1), self.LARGE + 2)
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.truncate(), self.LARGE + 2)
|
2007-04-10 17:08:41 -03:00
|
|
|
self.assertEqual(f.tell(), self.LARGE + 2)
|
|
|
|
self.assertEqual(f.seek(0, 2), self.LARGE + 2)
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.truncate(self.LARGE + 1), self.LARGE + 1)
|
2008-05-06 16:48:38 -03:00
|
|
|
self.assertEqual(f.tell(), self.LARGE + 1)
|
2007-04-10 17:08:41 -03:00
|
|
|
self.assertEqual(f.seek(0, 2), self.LARGE + 1)
|
|
|
|
self.assertEqual(f.seek(-1, 2), self.LARGE)
|
2007-04-10 16:01:47 -03:00
|
|
|
self.assertEqual(f.read(2), b"x")
|
|
|
|
|
2007-02-27 01:47:44 -04:00
|
|
|
def test_raw_file_io(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb", buffering=0)
|
2007-02-27 01:47:44 -04:00
|
|
|
self.assertEqual(f.readable(), False)
|
|
|
|
self.assertEqual(f.writable(), True)
|
|
|
|
self.assertEqual(f.seekable(), True)
|
|
|
|
self.write_ops(f)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "rb", buffering=0)
|
2007-02-27 01:47:44 -04:00
|
|
|
self.assertEqual(f.readable(), True)
|
|
|
|
self.assertEqual(f.writable(), False)
|
|
|
|
self.assertEqual(f.seekable(), True)
|
|
|
|
self.read_ops(f)
|
|
|
|
f.close()
|
|
|
|
|
2007-04-10 18:06:59 -03:00
|
|
|
def test_buffered_file_io(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb")
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.readable(), False)
|
|
|
|
self.assertEqual(f.writable(), True)
|
|
|
|
self.assertEqual(f.seekable(), True)
|
|
|
|
self.write_ops(f)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "rb")
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.readable(), True)
|
|
|
|
self.assertEqual(f.writable(), False)
|
|
|
|
self.assertEqual(f.seekable(), True)
|
2007-04-10 22:09:03 -03:00
|
|
|
self.read_ops(f, True)
|
2007-04-10 18:06:59 -03:00
|
|
|
f.close()
|
|
|
|
|
2007-06-07 20:45:37 -03:00
|
|
|
def test_readline(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb")
|
2007-06-07 20:45:37 -03:00
|
|
|
f.write(b"abc\ndef\nxyzzy\nfoo")
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "rb")
|
2007-06-07 20:45:37 -03:00
|
|
|
self.assertEqual(f.readline(), b"abc\n")
|
|
|
|
self.assertEqual(f.readline(10), b"def\n")
|
|
|
|
self.assertEqual(f.readline(2), b"xy")
|
|
|
|
self.assertEqual(f.readline(4), b"zzy\n")
|
|
|
|
self.assertEqual(f.readline(), b"foo")
|
|
|
|
f.close()
|
|
|
|
|
2007-02-27 01:47:44 -04:00
|
|
|
def test_raw_bytes_io(self):
|
|
|
|
f = io.BytesIO()
|
|
|
|
self.write_ops(f)
|
|
|
|
data = f.getvalue()
|
|
|
|
self.assertEqual(data, b"hello world\n")
|
|
|
|
f = io.BytesIO(data)
|
2007-04-10 22:09:03 -03:00
|
|
|
self.read_ops(f, True)
|
2007-02-27 01:47:44 -04:00
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
def test_large_file_ops(self):
|
2007-04-10 17:08:41 -03:00
|
|
|
# On Windows and Mac OSX this test comsumes large resources; It takes
|
|
|
|
# a long time to build the >2GB file and takes >2GB of disk space
|
|
|
|
# therefore the resource must be enabled to run this test.
|
|
|
|
if sys.platform[:3] == 'win' or sys.platform == 'darwin':
|
2008-05-20 18:35:26 -03:00
|
|
|
if not support.is_resource_enabled("largefile"):
|
2007-04-10 17:08:41 -03:00
|
|
|
print("\nTesting large file ops skipped on %s." % sys.platform,
|
|
|
|
file=sys.stderr)
|
|
|
|
print("It requires %d bytes and a long time." % self.LARGE,
|
|
|
|
file=sys.stderr)
|
|
|
|
print("Use 'regrtest.py -u largefile test_io' to run it.",
|
|
|
|
file=sys.stderr)
|
|
|
|
return
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "w+b", 0)
|
2007-04-10 16:01:47 -03:00
|
|
|
self.large_file_ops(f)
|
2007-03-07 20:43:48 -04:00
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "w+b")
|
2007-04-10 18:06:59 -03:00
|
|
|
self.large_file_ops(f)
|
|
|
|
f.close()
|
|
|
|
|
|
|
|
def test_with_open(self):
|
|
|
|
for bufsize in (0, 1, 100):
|
|
|
|
f = None
|
2008-05-20 18:35:26 -03:00
|
|
|
with open(support.TESTFN, "wb", bufsize) as f:
|
2007-08-27 17:44:15 -03:00
|
|
|
f.write(b"xxx")
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.closed, True)
|
|
|
|
f = None
|
|
|
|
try:
|
2008-05-20 18:35:26 -03:00
|
|
|
with open(support.TESTFN, "wb", bufsize) as f:
|
2007-04-10 18:06:59 -03:00
|
|
|
1/0
|
|
|
|
except ZeroDivisionError:
|
|
|
|
self.assertEqual(f.closed, True)
|
|
|
|
else:
|
|
|
|
self.fail("1/0 didn't raise an exception")
|
|
|
|
|
|
|
|
def test_destructor(self):
|
|
|
|
record = []
|
|
|
|
class MyFileIO(io.FileIO):
|
|
|
|
def __del__(self):
|
|
|
|
record.append(1)
|
|
|
|
io.FileIO.__del__(self)
|
|
|
|
def close(self):
|
|
|
|
record.append(2)
|
|
|
|
io.FileIO.close(self)
|
|
|
|
def flush(self):
|
|
|
|
record.append(3)
|
|
|
|
io.FileIO.flush(self)
|
2008-05-20 18:35:26 -03:00
|
|
|
f = MyFileIO(support.TESTFN, "w")
|
2007-04-10 18:06:59 -03:00
|
|
|
f.write("xxx")
|
|
|
|
del f
|
|
|
|
self.assertEqual(record, [1, 2, 3])
|
|
|
|
|
|
|
|
def test_close_flushes(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb")
|
2007-05-08 17:18:39 -03:00
|
|
|
f.write(b"xxx")
|
2007-04-10 18:06:59 -03:00
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "rb")
|
2007-04-10 18:06:59 -03:00
|
|
|
self.assertEqual(f.read(), b"xxx")
|
|
|
|
f.close()
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-12 02:44:49 -03:00
|
|
|
def test_array_writes(self):
|
|
|
|
a = array.array('i', range(10))
|
2007-10-07 23:46:15 -03:00
|
|
|
n = len(memoryview(a))
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb", 0)
|
2007-04-12 02:44:49 -03:00
|
|
|
self.assertEqual(f.write(a), n)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb")
|
2007-04-12 02:44:49 -03:00
|
|
|
self.assertEqual(f.write(a), n)
|
|
|
|
f.close()
|
|
|
|
|
2007-10-30 14:27:30 -03:00
|
|
|
def test_closefd(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
self.assertRaises(ValueError, io.open, support.TESTFN, 'w',
|
2007-10-30 14:27:30 -03:00
|
|
|
closefd=False)
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2008-11-05 15:30:32 -04:00
|
|
|
def testReadClosed(self):
|
|
|
|
with io.open(support.TESTFN, "w") as f:
|
|
|
|
f.write("egg\n")
|
|
|
|
with io.open(support.TESTFN, "r") as f:
|
|
|
|
file = io.open(f.fileno(), "r", closefd=False)
|
|
|
|
self.assertEqual(file.read(), "egg\n")
|
|
|
|
file.seek(0)
|
|
|
|
file.close()
|
|
|
|
self.assertRaises(ValueError, file.read)
|
|
|
|
|
|
|
|
def test_no_closefd_with_filename(self):
|
|
|
|
# can't use closefd in combination with a file name
|
|
|
|
self.assertRaises(ValueError, io.open, support.TESTFN, "r", closefd=False)
|
|
|
|
|
|
|
|
def test_closefd_attr(self):
|
|
|
|
with io.open(support.TESTFN, "wb") as f:
|
|
|
|
f.write(b"egg\n")
|
|
|
|
with io.open(support.TESTFN, "r") as f:
|
|
|
|
self.assertEqual(f.buffer.raw.closefd, True)
|
|
|
|
file = io.open(f.fileno(), "r", closefd=False)
|
|
|
|
self.assertEqual(file.buffer.raw.closefd, False)
|
|
|
|
|
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
class MemorySeekTestMixin:
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
def testInit(self):
|
2007-04-06 14:31:18 -03:00
|
|
|
buf = self.buftype("1234567890")
|
|
|
|
bytesIo = self.ioclass(buf)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testRead(self):
|
2007-04-06 14:31:18 -03:00
|
|
|
buf = self.buftype("1234567890")
|
|
|
|
bytesIo = self.ioclass(buf)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
self.assertEquals(buf[:1], bytesIo.read(1))
|
|
|
|
self.assertEquals(buf[1:5], bytesIo.read(4))
|
|
|
|
self.assertEquals(buf[5:], bytesIo.read(900))
|
2007-04-06 14:31:18 -03:00
|
|
|
self.assertEquals(self.EOF, bytesIo.read())
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testReadNoArgs(self):
|
2007-04-06 14:31:18 -03:00
|
|
|
buf = self.buftype("1234567890")
|
|
|
|
bytesIo = self.ioclass(buf)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
self.assertEquals(buf, bytesIo.read())
|
2007-04-06 14:31:18 -03:00
|
|
|
self.assertEquals(self.EOF, bytesIo.read())
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testSeek(self):
|
2007-04-06 14:31:18 -03:00
|
|
|
buf = self.buftype("1234567890")
|
|
|
|
bytesIo = self.ioclass(buf)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
bytesIo.read(5)
|
|
|
|
bytesIo.seek(0)
|
|
|
|
self.assertEquals(buf, bytesIo.read())
|
|
|
|
|
|
|
|
bytesIo.seek(3)
|
|
|
|
self.assertEquals(buf[3:], bytesIo.read())
|
2007-11-08 14:04:45 -04:00
|
|
|
self.assertRaises(TypeError, bytesIo.seek, 0.0)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testTell(self):
|
2007-04-06 14:31:18 -03:00
|
|
|
buf = self.buftype("1234567890")
|
|
|
|
bytesIo = self.ioclass(buf)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
self.assertEquals(0, bytesIo.tell())
|
|
|
|
bytesIo.seek(5)
|
|
|
|
self.assertEquals(5, bytesIo.tell())
|
|
|
|
bytesIo.seek(10000)
|
|
|
|
self.assertEquals(10000, bytesIo.tell())
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
class BytesIOTest(MemorySeekTestMixin, unittest.TestCase):
|
2007-08-27 14:23:59 -03:00
|
|
|
@staticmethod
|
|
|
|
def buftype(s):
|
|
|
|
return s.encode("utf-8")
|
2007-04-06 14:31:18 -03:00
|
|
|
ioclass = io.BytesIO
|
|
|
|
EOF = b""
|
|
|
|
|
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
class StringIOTest(MemorySeekTestMixin, unittest.TestCase):
|
2007-04-06 14:31:18 -03:00
|
|
|
buftype = str
|
|
|
|
ioclass = io.StringIO
|
|
|
|
EOF = ""
|
|
|
|
|
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
class BufferedReaderTest(unittest.TestCase):
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
def testRead(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
rawio = MockRawIO((b"abc", b"d", b"efg"))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedReader(rawio)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"abcdef", bufio.read(6))
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 14:31:18 -03:00
|
|
|
def testBuffering(self):
|
|
|
|
data = b"abcdefghi"
|
|
|
|
dlen = len(data)
|
|
|
|
|
|
|
|
tests = [
|
|
|
|
[ 100, [ 3, 1, 4, 8 ], [ dlen, 0 ] ],
|
|
|
|
[ 100, [ 3, 3, 3], [ dlen ] ],
|
|
|
|
[ 4, [ 1, 2, 4, 2 ], [ 4, 4, 1 ] ],
|
|
|
|
]
|
|
|
|
|
|
|
|
for bufsize, buf_read_sizes, raw_read_sizes in tests:
|
2007-04-06 16:10:29 -03:00
|
|
|
rawio = MockFileIO(data)
|
|
|
|
bufio = io.BufferedReader(rawio, buffer_size=bufsize)
|
2007-04-06 14:31:18 -03:00
|
|
|
pos = 0
|
|
|
|
for nbytes in buf_read_sizes:
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(bufio.read(nbytes), data[pos:pos+nbytes])
|
2007-04-06 14:31:18 -03:00
|
|
|
pos += nbytes
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(rawio.read_history, raw_read_sizes)
|
2007-04-06 14:31:18 -03:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def testReadNonBlocking(self):
|
|
|
|
# Inject some None's in there to simulate EWOULDBLOCK
|
2007-04-10 16:01:47 -03:00
|
|
|
rawio = MockRawIO((b"abc", b"d", None, b"efg", None, None))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedReader(rawio)
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"abcd", bufio.read(6))
|
|
|
|
self.assertEquals(b"e", bufio.read(1))
|
|
|
|
self.assertEquals(b"fg", bufio.read())
|
|
|
|
self.assert_(None is bufio.read())
|
|
|
|
self.assertEquals(b"", bufio.read())
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
def testReadToEof(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
rawio = MockRawIO((b"abc", b"d", b"efg"))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedReader(rawio)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"abcdefg", bufio.read(9000))
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testReadNoArgs(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
rawio = MockRawIO((b"abc", b"d", b"efg"))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedReader(rawio)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"abcdefg", bufio.read())
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testFileno(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
rawio = MockRawIO((b"abc", b"d", b"efg"))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedReader(rawio)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(42, bufio.fileno())
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testFilenoNoFileno(self):
|
2007-03-06 21:00:12 -04:00
|
|
|
# XXX will we always have fileno() function? If so, kill
|
2007-02-27 13:19:33 -04:00
|
|
|
# this test. Else, write it.
|
|
|
|
pass
|
|
|
|
|
2008-08-14 19:44:29 -03:00
|
|
|
def testThreads(self):
|
|
|
|
try:
|
|
|
|
# Write out many bytes with exactly the same number of 0's,
|
|
|
|
# 1's... 255's. This will help us check that concurrent reading
|
|
|
|
# doesn't duplicate or forget contents.
|
|
|
|
N = 1000
|
|
|
|
l = list(range(256)) * N
|
|
|
|
random.shuffle(l)
|
|
|
|
s = bytes(bytearray(l))
|
|
|
|
with io.open(support.TESTFN, "wb") as f:
|
|
|
|
f.write(s)
|
|
|
|
with io.open(support.TESTFN, "rb", buffering=0) as raw:
|
|
|
|
bufio = io.BufferedReader(raw, 8)
|
|
|
|
errors = []
|
|
|
|
results = []
|
|
|
|
def f():
|
|
|
|
try:
|
|
|
|
# Intra-buffer read then buffer-flushing read
|
|
|
|
for n in cycle([1, 19]):
|
|
|
|
s = bufio.read(n)
|
|
|
|
if not s:
|
|
|
|
break
|
|
|
|
# list.append() is atomic
|
|
|
|
results.append(s)
|
|
|
|
except Exception as e:
|
|
|
|
errors.append(e)
|
|
|
|
raise
|
|
|
|
threads = [threading.Thread(target=f) for x in range(20)]
|
|
|
|
for t in threads:
|
|
|
|
t.start()
|
|
|
|
time.sleep(0.02) # yield
|
|
|
|
for t in threads:
|
|
|
|
t.join()
|
|
|
|
self.assertFalse(errors,
|
|
|
|
"the following exceptions were caught: %r" % errors)
|
|
|
|
s = b''.join(results)
|
|
|
|
for i in range(256):
|
|
|
|
c = bytes(bytearray([i]))
|
|
|
|
self.assertEqual(s.count(c), N)
|
|
|
|
finally:
|
|
|
|
support.unlink(support.TESTFN)
|
|
|
|
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
class BufferedWriterTest(unittest.TestCase):
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
def testWrite(self):
|
|
|
|
# Write to the buffered IO but don't overflow the buffer.
|
2007-04-10 16:01:47 -03:00
|
|
|
writer = MockRawIO()
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedWriter(writer, 8)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"abc")
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertFalse(writer._write_stack)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
|
|
|
def testWriteOverflow(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
writer = MockRawIO()
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedWriter(writer, 8)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"abc")
|
|
|
|
bufio.write(b"defghijkl")
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"abcdefghijkl", writer._write_stack[0])
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def testWriteNonBlocking(self):
|
|
|
|
raw = MockNonBlockWriterIO((9, 2, 22, -6, 10, 12, 12))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedWriter(raw, 8, 16)
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"asdf")
|
|
|
|
bufio.write(b"asdfa")
|
2007-03-06 21:00:12 -04:00
|
|
|
self.assertEquals(b"asdfasdfa", raw._write_stack[0])
|
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"asdfasdfasdf")
|
2007-03-06 21:00:12 -04:00
|
|
|
self.assertEquals(b"asdfasdfasdf", raw._write_stack[1])
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"asdfasdfasdf")
|
2007-03-06 21:00:12 -04:00
|
|
|
self.assertEquals(b"dfasdfasdf", raw._write_stack[2])
|
|
|
|
self.assertEquals(b"asdfasdfasdf", raw._write_stack[3])
|
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"asdfasdfasdf")
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-04-06 14:31:18 -03:00
|
|
|
# XXX I don't like this test. It relies too heavily on how the
|
|
|
|
# algorithm actually works, which we might change. Refactor
|
|
|
|
# later.
|
2007-03-06 21:00:12 -04:00
|
|
|
|
|
|
|
def testFileno(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
rawio = MockRawIO((b"abc", b"d", b"efg"))
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedWriter(rawio)
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(42, bufio.fileno())
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-02-27 13:19:33 -04:00
|
|
|
def testFlush(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
writer = MockRawIO()
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio = io.BufferedWriter(writer, 8)
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
bufio.write(b"abc")
|
|
|
|
bufio.flush()
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"abc", writer._write_stack[0])
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2008-08-14 19:44:29 -03:00
|
|
|
def testThreads(self):
|
|
|
|
# BufferedWriter should not raise exceptions or crash
|
|
|
|
# when called from multiple threads.
|
|
|
|
try:
|
|
|
|
# We use a real file object because it allows us to
|
|
|
|
# exercise situations where the GIL is released before
|
|
|
|
# writing the buffer to the raw streams. This is in addition
|
|
|
|
# to concurrency issues due to switching threads in the middle
|
|
|
|
# of Python code.
|
|
|
|
with io.open(support.TESTFN, "wb", buffering=0) as raw:
|
|
|
|
bufio = io.BufferedWriter(raw, 8)
|
|
|
|
errors = []
|
|
|
|
def f():
|
|
|
|
try:
|
|
|
|
# Write enough bytes to flush the buffer
|
|
|
|
s = b"a" * 19
|
|
|
|
for i in range(50):
|
|
|
|
bufio.write(s)
|
|
|
|
except Exception as e:
|
|
|
|
errors.append(e)
|
|
|
|
raise
|
|
|
|
threads = [threading.Thread(target=f) for x in range(20)]
|
|
|
|
for t in threads:
|
|
|
|
t.start()
|
|
|
|
time.sleep(0.02) # yield
|
|
|
|
for t in threads:
|
|
|
|
t.join()
|
|
|
|
self.assertFalse(errors,
|
|
|
|
"the following exceptions were caught: %r" % errors)
|
|
|
|
finally:
|
|
|
|
support.unlink(support.TESTFN)
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
class BufferedRWPairTest(unittest.TestCase):
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def testRWPair(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
r = MockRawIO(())
|
|
|
|
w = MockRawIO()
|
2007-03-06 21:00:12 -04:00
|
|
|
pair = io.BufferedRWPair(r, w)
|
Merged revisions 67889-67892,67895,67898,67904-67907,67912,67918,67920-67921,67923-67924,67926-67927,67930,67943 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line
sphinx.web is long gone
................
r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line
update readme
................
r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line
there are way too many places which need to have the current version added
................
r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines
Merged revisions 67809 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line
fix logic error
........
................
r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines
Add Tarek for work on distutils.
................
r67898 | benjamin.peterson | 2008-12-21 15:00:53 -0600 (Sun, 21 Dec 2008) | 1 line
compute DISTVERSION with patchlevel.py
................
r67904 | benjamin.peterson | 2008-12-22 14:44:58 -0600 (Mon, 22 Dec 2008) | 1 line
less attitude
................
r67905 | benjamin.peterson | 2008-12-22 14:51:15 -0600 (Mon, 22 Dec 2008) | 1 line
fix #4720: the format to PyArg_ParseTupleAndKeywords can now start with '|'
................
r67906 | benjamin.peterson | 2008-12-22 14:52:53 -0600 (Mon, 22 Dec 2008) | 1 line
add NEWS note
................
r67907 | benjamin.peterson | 2008-12-22 16:12:19 -0600 (Mon, 22 Dec 2008) | 1 line
silence compiler warning
................
r67912 | georg.brandl | 2008-12-23 06:37:21 -0600 (Tue, 23 Dec 2008) | 2 lines
Fix missing "svn" command.
................
r67918 | georg.brandl | 2008-12-23 09:44:25 -0600 (Tue, 23 Dec 2008) | 2 lines
Markup fix.
................
r67920 | benjamin.peterson | 2008-12-23 14:09:28 -0600 (Tue, 23 Dec 2008) | 1 line
use a global variable, so the compiler doesn't optimize the assignment out
................
r67921 | benjamin.peterson | 2008-12-23 14:12:33 -0600 (Tue, 23 Dec 2008) | 1 line
make global static
................
r67923 | benjamin.peterson | 2008-12-24 09:10:27 -0600 (Wed, 24 Dec 2008) | 1 line
#4736 BufferRWPair.closed shouldn't try to call another property as a function
................
r67924 | benjamin.peterson | 2008-12-24 10:10:05 -0600 (Wed, 24 Dec 2008) | 1 line
pretend exceptions don't exist a while longer
................
r67926 | tarek.ziade | 2008-12-24 13:10:05 -0600 (Wed, 24 Dec 2008) | 1 line
fixed #4400 : distutils .pypirc default generated file was broken.
................
r67927 | benjamin.peterson | 2008-12-26 17:26:30 -0600 (Fri, 26 Dec 2008) | 1 line
python version is included in file name now
................
r67930 | hirokazu.yamamoto | 2008-12-26 22:19:48 -0600 (Fri, 26 Dec 2008) | 2 lines
Issue #4740: Use HIGHEST_PROTOCOL in pickle test.
(There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
................
r67943 | alexandre.vassalotti | 2008-12-27 04:02:59 -0600 (Sat, 27 Dec 2008) | 2 lines
Fix bogus unicode tests in pickletester.
................
2008-12-27 12:00:54 -04:00
|
|
|
self.assertFalse(pair.closed)
|
2007-03-06 21:00:12 -04:00
|
|
|
|
Merged revisions 67889-67892,67895,67898,67904-67907,67912,67918,67920-67921,67923-67924,67926-67927,67930,67943 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line
sphinx.web is long gone
................
r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line
update readme
................
r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line
there are way too many places which need to have the current version added
................
r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines
Merged revisions 67809 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line
fix logic error
........
................
r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines
Add Tarek for work on distutils.
................
r67898 | benjamin.peterson | 2008-12-21 15:00:53 -0600 (Sun, 21 Dec 2008) | 1 line
compute DISTVERSION with patchlevel.py
................
r67904 | benjamin.peterson | 2008-12-22 14:44:58 -0600 (Mon, 22 Dec 2008) | 1 line
less attitude
................
r67905 | benjamin.peterson | 2008-12-22 14:51:15 -0600 (Mon, 22 Dec 2008) | 1 line
fix #4720: the format to PyArg_ParseTupleAndKeywords can now start with '|'
................
r67906 | benjamin.peterson | 2008-12-22 14:52:53 -0600 (Mon, 22 Dec 2008) | 1 line
add NEWS note
................
r67907 | benjamin.peterson | 2008-12-22 16:12:19 -0600 (Mon, 22 Dec 2008) | 1 line
silence compiler warning
................
r67912 | georg.brandl | 2008-12-23 06:37:21 -0600 (Tue, 23 Dec 2008) | 2 lines
Fix missing "svn" command.
................
r67918 | georg.brandl | 2008-12-23 09:44:25 -0600 (Tue, 23 Dec 2008) | 2 lines
Markup fix.
................
r67920 | benjamin.peterson | 2008-12-23 14:09:28 -0600 (Tue, 23 Dec 2008) | 1 line
use a global variable, so the compiler doesn't optimize the assignment out
................
r67921 | benjamin.peterson | 2008-12-23 14:12:33 -0600 (Tue, 23 Dec 2008) | 1 line
make global static
................
r67923 | benjamin.peterson | 2008-12-24 09:10:27 -0600 (Wed, 24 Dec 2008) | 1 line
#4736 BufferRWPair.closed shouldn't try to call another property as a function
................
r67924 | benjamin.peterson | 2008-12-24 10:10:05 -0600 (Wed, 24 Dec 2008) | 1 line
pretend exceptions don't exist a while longer
................
r67926 | tarek.ziade | 2008-12-24 13:10:05 -0600 (Wed, 24 Dec 2008) | 1 line
fixed #4400 : distutils .pypirc default generated file was broken.
................
r67927 | benjamin.peterson | 2008-12-26 17:26:30 -0600 (Fri, 26 Dec 2008) | 1 line
python version is included in file name now
................
r67930 | hirokazu.yamamoto | 2008-12-26 22:19:48 -0600 (Fri, 26 Dec 2008) | 2 lines
Issue #4740: Use HIGHEST_PROTOCOL in pickle test.
(There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
................
r67943 | alexandre.vassalotti | 2008-12-27 04:02:59 -0600 (Sat, 27 Dec 2008) | 2 lines
Fix bogus unicode tests in pickletester.
................
2008-12-27 12:00:54 -04:00
|
|
|
# XXX More Tests
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-06 14:31:18 -03:00
|
|
|
class BufferedRandomTest(unittest.TestCase):
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
def testReadAndWrite(self):
|
2007-04-10 16:01:47 -03:00
|
|
|
raw = MockRawIO((b"asdf", b"ghjk"))
|
2007-03-06 21:00:12 -04:00
|
|
|
rw = io.BufferedRandom(raw, 8, 12)
|
|
|
|
|
|
|
|
self.assertEqual(b"as", rw.read(2))
|
|
|
|
rw.write(b"ddd")
|
|
|
|
rw.write(b"eee")
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertFalse(raw._write_stack) # Buffer writes
|
2007-03-06 21:00:12 -04:00
|
|
|
self.assertEqual(b"ghjk", rw.read()) # This read forces write flush
|
2007-04-06 16:10:29 -03:00
|
|
|
self.assertEquals(b"dddeee", raw._write_stack[0])
|
2007-03-06 21:00:12 -04:00
|
|
|
|
|
|
|
def testSeekAndTell(self):
|
|
|
|
raw = io.BytesIO(b"asdfghjkl")
|
|
|
|
rw = io.BufferedRandom(raw)
|
|
|
|
|
|
|
|
self.assertEquals(b"as", rw.read(2))
|
|
|
|
self.assertEquals(2, rw.tell())
|
|
|
|
rw.seek(0, 0)
|
|
|
|
self.assertEquals(b"asdf", rw.read(4))
|
|
|
|
|
|
|
|
rw.write(b"asdf")
|
|
|
|
rw.seek(0, 0)
|
|
|
|
self.assertEquals(b"asdfasdfl", rw.read())
|
|
|
|
self.assertEquals(9, rw.tell())
|
|
|
|
rw.seek(-4, 2)
|
|
|
|
self.assertEquals(5, rw.tell())
|
|
|
|
rw.seek(2, 1)
|
|
|
|
self.assertEquals(7, rw.tell())
|
|
|
|
self.assertEquals(b"fl", rw.read(11))
|
2007-11-08 14:04:45 -04:00
|
|
|
self.assertRaises(TypeError, rw.seek, 0.0)
|
2007-03-06 21:00:12 -04:00
|
|
|
|
2008-03-18 01:51:32 -03:00
|
|
|
# To fully exercise seek/tell, the StatefulIncrementalDecoder has these
|
|
|
|
# properties:
|
|
|
|
# - A single output character can correspond to many bytes of input.
|
|
|
|
# - The number of input bytes to complete the character can be
|
|
|
|
# undetermined until the last input byte is received.
|
|
|
|
# - The number of input bytes can vary depending on previous input.
|
|
|
|
# - A single input byte can correspond to many characters of output.
|
|
|
|
# - The number of output characters can be undetermined until the
|
|
|
|
# last input byte is received.
|
|
|
|
# - The number of output characters can vary depending on previous input.
|
|
|
|
|
|
|
|
class StatefulIncrementalDecoder(codecs.IncrementalDecoder):
|
|
|
|
"""
|
|
|
|
For testing seek/tell behavior with a stateful, buffering decoder.
|
|
|
|
|
|
|
|
Input is a sequence of words. Words may be fixed-length (length set
|
|
|
|
by input) or variable-length (period-terminated). In variable-length
|
|
|
|
mode, extra periods are ignored. Possible words are:
|
|
|
|
- 'i' followed by a number sets the input length, I (maximum 99).
|
|
|
|
When I is set to 0, words are space-terminated.
|
|
|
|
- 'o' followed by a number sets the output length, O (maximum 99).
|
|
|
|
- Any other word is converted into a word followed by a period on
|
|
|
|
the output. The output word consists of the input word truncated
|
|
|
|
or padded out with hyphens to make its length equal to O. If O
|
|
|
|
is 0, the word is output verbatim without truncating or padding.
|
|
|
|
I and O are initially set to 1. When I changes, any buffered input is
|
|
|
|
re-scanned according to the new I. EOF also terminates the last word.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, errors='strict'):
|
2008-03-22 23:11:13 -03:00
|
|
|
codecs.IncrementalDecoder.__init__(self, errors)
|
2008-03-18 01:51:32 -03:00
|
|
|
self.reset()
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return '<SID %x>' % id(self)
|
|
|
|
|
|
|
|
def reset(self):
|
|
|
|
self.i = 1
|
|
|
|
self.o = 1
|
|
|
|
self.buffer = bytearray()
|
|
|
|
|
|
|
|
def getstate(self):
|
|
|
|
i, o = self.i ^ 1, self.o ^ 1 # so that flags = 0 after reset()
|
|
|
|
return bytes(self.buffer), i*100 + o
|
|
|
|
|
|
|
|
def setstate(self, state):
|
|
|
|
buffer, io = state
|
|
|
|
self.buffer = bytearray(buffer)
|
|
|
|
i, o = divmod(io, 100)
|
|
|
|
self.i, self.o = i ^ 1, o ^ 1
|
|
|
|
|
|
|
|
def decode(self, input, final=False):
|
|
|
|
output = ''
|
|
|
|
for b in input:
|
|
|
|
if self.i == 0: # variable-length, terminated with period
|
|
|
|
if b == ord('.'):
|
|
|
|
if self.buffer:
|
|
|
|
output += self.process_word()
|
|
|
|
else:
|
|
|
|
self.buffer.append(b)
|
|
|
|
else: # fixed-length, terminate after self.i bytes
|
|
|
|
self.buffer.append(b)
|
|
|
|
if len(self.buffer) == self.i:
|
|
|
|
output += self.process_word()
|
|
|
|
if final and self.buffer: # EOF terminates the last word
|
|
|
|
output += self.process_word()
|
|
|
|
return output
|
|
|
|
|
|
|
|
def process_word(self):
|
|
|
|
output = ''
|
|
|
|
if self.buffer[0] == ord('i'):
|
|
|
|
self.i = min(99, int(self.buffer[1:] or 0)) # set input length
|
|
|
|
elif self.buffer[0] == ord('o'):
|
|
|
|
self.o = min(99, int(self.buffer[1:] or 0)) # set output length
|
|
|
|
else:
|
|
|
|
output = self.buffer.decode('ascii')
|
|
|
|
if len(output) < self.o:
|
|
|
|
output += '-'*self.o # pad out with hyphens
|
|
|
|
if self.o:
|
|
|
|
output = output[:self.o] # truncate to output length
|
|
|
|
output += '.'
|
|
|
|
self.buffer = bytearray()
|
|
|
|
return output
|
|
|
|
|
Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62090 | brett.cannon | 2008-04-01 07:37:43 -0500 (Tue, 01 Apr 2008) | 3 lines
Generalize test.test_support.test_stdout() with a base context manager so that
it is easy to capture stderr if desired.
........
r62091 | brett.cannon | 2008-04-01 07:46:02 -0500 (Tue, 01 Apr 2008) | 3 lines
Add ``if __name__ == '__main__'`` to some test files where it didn't take a lot
of effort to do so.
........
r62096 | amaury.forgeotdarc | 2008-04-01 17:52:48 -0500 (Tue, 01 Apr 2008) | 4 lines
Newly enabled test appears to leak:
it registers the same codec on each iteration.
Do it only once at load time.
........
r62100 | amaury.forgeotdarc | 2008-04-01 19:55:04 -0500 (Tue, 01 Apr 2008) | 4 lines
A DocTestSuite cannot run multiple times: it clears its globals dictionary after the first run.
Rebuild the DocTestSuite on each iteration.
........
r62102 | jeffrey.yasskin | 2008-04-01 23:07:44 -0500 (Tue, 01 Apr 2008) | 3 lines
Try to make test_signal less flaky. I still see some flakiness in
test_itimer_prof.
........
r62110 | vinay.sajip | 2008-04-02 16:09:27 -0500 (Wed, 02 Apr 2008) | 1 line
Fix: #2315, #2316, #2317: TimedRotatingFileHandler - changed logic to better handle daylight savings time, deletion of old log files, and fixed a bug in calculating rollover when no logging occurs for a longer interval than the rollover period.
........
r62111 | vinay.sajip | 2008-04-02 16:10:23 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62112 | vinay.sajip | 2008-04-02 16:17:25 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62113 | amaury.forgeotdarc | 2008-04-02 16:18:46 -0500 (Wed, 02 Apr 2008) | 2 lines
Remove debug prints; the buildbot now passes the tests
........
r62114 | benjamin.peterson | 2008-04-02 16:20:35 -0500 (Wed, 02 Apr 2008) | 2 lines
Suggested proposed changes to Python be considered on some mailing lists first
........
2008-04-02 18:49:44 -03:00
|
|
|
codecEnabled = False
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def lookupTestDecoder(cls, name):
|
|
|
|
if cls.codecEnabled and name == 'test_decoder':
|
2008-12-14 12:36:46 -04:00
|
|
|
latin1 = codecs.lookup('latin-1')
|
Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62090 | brett.cannon | 2008-04-01 07:37:43 -0500 (Tue, 01 Apr 2008) | 3 lines
Generalize test.test_support.test_stdout() with a base context manager so that
it is easy to capture stderr if desired.
........
r62091 | brett.cannon | 2008-04-01 07:46:02 -0500 (Tue, 01 Apr 2008) | 3 lines
Add ``if __name__ == '__main__'`` to some test files where it didn't take a lot
of effort to do so.
........
r62096 | amaury.forgeotdarc | 2008-04-01 17:52:48 -0500 (Tue, 01 Apr 2008) | 4 lines
Newly enabled test appears to leak:
it registers the same codec on each iteration.
Do it only once at load time.
........
r62100 | amaury.forgeotdarc | 2008-04-01 19:55:04 -0500 (Tue, 01 Apr 2008) | 4 lines
A DocTestSuite cannot run multiple times: it clears its globals dictionary after the first run.
Rebuild the DocTestSuite on each iteration.
........
r62102 | jeffrey.yasskin | 2008-04-01 23:07:44 -0500 (Tue, 01 Apr 2008) | 3 lines
Try to make test_signal less flaky. I still see some flakiness in
test_itimer_prof.
........
r62110 | vinay.sajip | 2008-04-02 16:09:27 -0500 (Wed, 02 Apr 2008) | 1 line
Fix: #2315, #2316, #2317: TimedRotatingFileHandler - changed logic to better handle daylight savings time, deletion of old log files, and fixed a bug in calculating rollover when no logging occurs for a longer interval than the rollover period.
........
r62111 | vinay.sajip | 2008-04-02 16:10:23 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62112 | vinay.sajip | 2008-04-02 16:17:25 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62113 | amaury.forgeotdarc | 2008-04-02 16:18:46 -0500 (Wed, 02 Apr 2008) | 2 lines
Remove debug prints; the buildbot now passes the tests
........
r62114 | benjamin.peterson | 2008-04-02 16:20:35 -0500 (Wed, 02 Apr 2008) | 2 lines
Suggested proposed changes to Python be considered on some mailing lists first
........
2008-04-02 18:49:44 -03:00
|
|
|
return codecs.CodecInfo(
|
2008-12-14 12:36:46 -04:00
|
|
|
name='test_decoder', encode=latin1.encode, decode=None,
|
Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62090 | brett.cannon | 2008-04-01 07:37:43 -0500 (Tue, 01 Apr 2008) | 3 lines
Generalize test.test_support.test_stdout() with a base context manager so that
it is easy to capture stderr if desired.
........
r62091 | brett.cannon | 2008-04-01 07:46:02 -0500 (Tue, 01 Apr 2008) | 3 lines
Add ``if __name__ == '__main__'`` to some test files where it didn't take a lot
of effort to do so.
........
r62096 | amaury.forgeotdarc | 2008-04-01 17:52:48 -0500 (Tue, 01 Apr 2008) | 4 lines
Newly enabled test appears to leak:
it registers the same codec on each iteration.
Do it only once at load time.
........
r62100 | amaury.forgeotdarc | 2008-04-01 19:55:04 -0500 (Tue, 01 Apr 2008) | 4 lines
A DocTestSuite cannot run multiple times: it clears its globals dictionary after the first run.
Rebuild the DocTestSuite on each iteration.
........
r62102 | jeffrey.yasskin | 2008-04-01 23:07:44 -0500 (Tue, 01 Apr 2008) | 3 lines
Try to make test_signal less flaky. I still see some flakiness in
test_itimer_prof.
........
r62110 | vinay.sajip | 2008-04-02 16:09:27 -0500 (Wed, 02 Apr 2008) | 1 line
Fix: #2315, #2316, #2317: TimedRotatingFileHandler - changed logic to better handle daylight savings time, deletion of old log files, and fixed a bug in calculating rollover when no logging occurs for a longer interval than the rollover period.
........
r62111 | vinay.sajip | 2008-04-02 16:10:23 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62112 | vinay.sajip | 2008-04-02 16:17:25 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62113 | amaury.forgeotdarc | 2008-04-02 16:18:46 -0500 (Wed, 02 Apr 2008) | 2 lines
Remove debug prints; the buildbot now passes the tests
........
r62114 | benjamin.peterson | 2008-04-02 16:20:35 -0500 (Wed, 02 Apr 2008) | 2 lines
Suggested proposed changes to Python be considered on some mailing lists first
........
2008-04-02 18:49:44 -03:00
|
|
|
incrementalencoder=None,
|
|
|
|
streamreader=None, streamwriter=None,
|
|
|
|
incrementaldecoder=cls)
|
|
|
|
|
|
|
|
# Register the previous decoder for testing.
|
|
|
|
# Disabled by default, tests will enable it.
|
|
|
|
codecs.register(StatefulIncrementalDecoder.lookupTestDecoder)
|
|
|
|
|
|
|
|
|
2008-03-18 01:51:32 -03:00
|
|
|
class StatefulIncrementalDecoderTest(unittest.TestCase):
|
|
|
|
"""
|
|
|
|
Make sure the StatefulIncrementalDecoder actually works.
|
|
|
|
"""
|
|
|
|
|
|
|
|
test_cases = [
|
2008-03-20 07:51:27 -03:00
|
|
|
# I=1, O=1 (fixed-length input == fixed-length output)
|
2008-03-18 01:51:32 -03:00
|
|
|
(b'abcd', False, 'a.b.c.d.'),
|
2008-03-20 07:51:27 -03:00
|
|
|
# I=0, O=0 (variable-length input, variable-length output)
|
2008-03-18 01:51:32 -03:00
|
|
|
(b'oiabcd', True, 'abcd.'),
|
2008-03-20 07:51:27 -03:00
|
|
|
# I=0, O=0 (should ignore extra periods)
|
2008-03-18 01:51:32 -03:00
|
|
|
(b'oi...abcd...', True, 'abcd.'),
|
2008-03-20 07:51:27 -03:00
|
|
|
# I=0, O=6 (variable-length input, fixed-length output)
|
|
|
|
(b'i.o6.x.xyz.toolongtofit.', False, 'x-----.xyz---.toolon.'),
|
|
|
|
# I=2, O=6 (fixed-length input < fixed-length output)
|
2008-03-18 01:51:32 -03:00
|
|
|
(b'i.i2.o6xyz', True, 'xy----.z-----.'),
|
2008-03-20 07:51:27 -03:00
|
|
|
# I=6, O=3 (fixed-length input > fixed-length output)
|
|
|
|
(b'i.o3.i6.abcdefghijklmnop', True, 'abc.ghi.mno.'),
|
|
|
|
# I=0, then 3; O=29, then 15 (with longer output)
|
|
|
|
(b'i.o29.a.b.cde.o15.abcdefghijabcdefghij.i3.a.b.c.d.ei00k.l.m', True,
|
|
|
|
'a----------------------------.' +
|
|
|
|
'b----------------------------.' +
|
|
|
|
'cde--------------------------.' +
|
|
|
|
'abcdefghijabcde.' +
|
|
|
|
'a.b------------.' +
|
|
|
|
'.c.------------.' +
|
|
|
|
'd.e------------.' +
|
|
|
|
'k--------------.' +
|
|
|
|
'l--------------.' +
|
|
|
|
'm--------------.')
|
2008-03-18 01:51:32 -03:00
|
|
|
]
|
|
|
|
|
|
|
|
def testDecoder(self):
|
|
|
|
# Try a few one-shot test cases.
|
|
|
|
for input, eof, output in self.test_cases:
|
|
|
|
d = StatefulIncrementalDecoder()
|
|
|
|
self.assertEquals(d.decode(input, eof), output)
|
|
|
|
|
|
|
|
# Also test an unfinished decode, followed by forcing EOF.
|
|
|
|
d = StatefulIncrementalDecoder()
|
|
|
|
self.assertEquals(d.decode(b'oiabcd'), '')
|
|
|
|
self.assertEquals(d.decode(b'', 1), 'abcd.')
|
2007-04-06 14:31:18 -03:00
|
|
|
|
|
|
|
class TextIOWrapperTest(unittest.TestCase):
|
2007-04-10 22:09:03 -03:00
|
|
|
|
2007-11-19 16:34:10 -04:00
|
|
|
def setUp(self):
|
|
|
|
self.testdata = b"AAA\r\nBBB\rCCC\r\nDDD\nEEE\r\n"
|
|
|
|
self.normalized = b"AAA\nBBB\nCCC\nDDD\nEEE\n".decode("ascii")
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(support.TESTFN)
|
2007-11-19 16:34:10 -04:00
|
|
|
|
2007-04-11 13:32:43 -03:00
|
|
|
def tearDown(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(support.TESTFN)
|
2007-04-10 22:09:03 -03:00
|
|
|
|
2007-12-05 21:04:26 -04:00
|
|
|
def testLineBuffering(self):
|
|
|
|
r = io.BytesIO()
|
|
|
|
b = io.BufferedWriter(r, 1000)
|
|
|
|
t = io.TextIOWrapper(b, newline="\n", line_buffering=True)
|
|
|
|
t.write("X")
|
|
|
|
self.assertEquals(r.getvalue(), b"") # No flush happened
|
|
|
|
t.write("Y\nZ")
|
|
|
|
self.assertEquals(r.getvalue(), b"XY\nZ") # All got flushed
|
|
|
|
t.write("A\rB")
|
|
|
|
self.assertEquals(r.getvalue(), b"XY\nZA\rB")
|
|
|
|
|
2007-12-03 18:54:21 -04:00
|
|
|
def testEncodingErrorsReading(self):
|
|
|
|
# (1) default
|
|
|
|
b = io.BytesIO(b"abc\n\xff\n")
|
|
|
|
t = io.TextIOWrapper(b, encoding="ascii")
|
|
|
|
self.assertRaises(UnicodeError, t.read)
|
|
|
|
# (2) explicit strict
|
|
|
|
b = io.BytesIO(b"abc\n\xff\n")
|
|
|
|
t = io.TextIOWrapper(b, encoding="ascii", errors="strict")
|
|
|
|
self.assertRaises(UnicodeError, t.read)
|
|
|
|
# (3) ignore
|
|
|
|
b = io.BytesIO(b"abc\n\xff\n")
|
|
|
|
t = io.TextIOWrapper(b, encoding="ascii", errors="ignore")
|
|
|
|
self.assertEquals(t.read(), "abc\n\n")
|
|
|
|
# (4) replace
|
|
|
|
b = io.BytesIO(b"abc\n\xff\n")
|
|
|
|
t = io.TextIOWrapper(b, encoding="ascii", errors="replace")
|
|
|
|
self.assertEquals(t.read(), "abc\n\ufffd\n")
|
|
|
|
|
|
|
|
def testEncodingErrorsWriting(self):
|
|
|
|
# (1) default
|
|
|
|
b = io.BytesIO()
|
|
|
|
t = io.TextIOWrapper(b, encoding="ascii")
|
|
|
|
self.assertRaises(UnicodeError, t.write, "\xff")
|
|
|
|
# (2) explicit strict
|
|
|
|
b = io.BytesIO()
|
|
|
|
t = io.TextIOWrapper(b, encoding="ascii", errors="strict")
|
|
|
|
self.assertRaises(UnicodeError, t.write, "\xff")
|
|
|
|
# (3) ignore
|
|
|
|
b = io.BytesIO()
|
2007-12-05 21:04:26 -04:00
|
|
|
t = io.TextIOWrapper(b, encoding="ascii", errors="ignore",
|
|
|
|
newline="\n")
|
2007-12-03 18:54:21 -04:00
|
|
|
t.write("abc\xffdef\n")
|
|
|
|
t.flush()
|
2007-12-05 13:59:44 -04:00
|
|
|
self.assertEquals(b.getvalue(), b"abcdef\n")
|
2007-12-03 18:54:21 -04:00
|
|
|
# (4) replace
|
|
|
|
b = io.BytesIO()
|
2007-12-05 21:04:26 -04:00
|
|
|
t = io.TextIOWrapper(b, encoding="ascii", errors="replace",
|
|
|
|
newline="\n")
|
2007-12-03 18:54:21 -04:00
|
|
|
t.write("abc\xffdef\n")
|
|
|
|
t.flush()
|
2007-12-05 13:59:44 -04:00
|
|
|
self.assertEquals(b.getvalue(), b"abc?def\n")
|
2007-12-03 18:54:21 -04:00
|
|
|
|
2007-08-18 18:39:55 -03:00
|
|
|
def testNewlinesInput(self):
|
|
|
|
testdata = b"AAA\nBBB\nCCC\rDDD\rEEE\r\nFFF\r\nGGG"
|
|
|
|
normalized = testdata.replace(b"\r\n", b"\n").replace(b"\r", b"\n")
|
|
|
|
for newline, expected in [
|
2007-11-19 16:34:10 -04:00
|
|
|
(None, normalized.decode("ascii").splitlines(True)),
|
|
|
|
("", testdata.decode("ascii").splitlines(True)),
|
2007-08-18 18:39:55 -03:00
|
|
|
("\n", ["AAA\n", "BBB\n", "CCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]),
|
|
|
|
("\r\n", ["AAA\nBBB\nCCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]),
|
|
|
|
("\r", ["AAA\nBBB\nCCC\r", "DDD\r", "EEE\r", "\nFFF\r", "\nGGG"]),
|
|
|
|
]:
|
|
|
|
buf = io.BytesIO(testdata)
|
2007-11-19 16:34:10 -04:00
|
|
|
txt = io.TextIOWrapper(buf, encoding="ascii", newline=newline)
|
2007-08-18 18:39:55 -03:00
|
|
|
self.assertEquals(txt.readlines(), expected)
|
|
|
|
txt.seek(0)
|
|
|
|
self.assertEquals(txt.read(), "".join(expected))
|
|
|
|
|
|
|
|
def testNewlinesOutput(self):
|
|
|
|
testdict = {
|
|
|
|
"": b"AAA\nBBB\nCCC\nX\rY\r\nZ",
|
|
|
|
"\n": b"AAA\nBBB\nCCC\nX\rY\r\nZ",
|
|
|
|
"\r": b"AAA\rBBB\rCCC\rX\rY\r\rZ",
|
|
|
|
"\r\n": b"AAA\r\nBBB\r\nCCC\r\nX\rY\r\r\nZ",
|
|
|
|
}
|
|
|
|
tests = [(None, testdict[os.linesep])] + sorted(testdict.items())
|
|
|
|
for newline, expected in tests:
|
|
|
|
buf = io.BytesIO()
|
2007-11-19 16:34:10 -04:00
|
|
|
txt = io.TextIOWrapper(buf, encoding="ascii", newline=newline)
|
2007-08-18 18:39:55 -03:00
|
|
|
txt.write("AAA\nB")
|
|
|
|
txt.write("BB\nCCC\n")
|
|
|
|
txt.write("X\rY\r\nZ")
|
|
|
|
txt.flush()
|
2008-05-06 16:48:38 -03:00
|
|
|
self.assertEquals(buf.closed, False)
|
2007-08-18 18:39:55 -03:00
|
|
|
self.assertEquals(buf.getvalue(), expected)
|
|
|
|
|
2007-04-06 14:31:18 -03:00
|
|
|
def testNewlines(self):
|
|
|
|
input_lines = [ "unix\n", "windows\r\n", "os9\r", "last\n", "nonl" ]
|
|
|
|
|
|
|
|
tests = [
|
|
|
|
[ None, [ 'unix\n', 'windows\n', 'os9\n', 'last\n', 'nonl' ] ],
|
2007-08-18 18:39:55 -03:00
|
|
|
[ '', input_lines ],
|
|
|
|
[ '\n', [ "unix\n", "windows\r\n", "os9\rlast\n", "nonl" ] ],
|
|
|
|
[ '\r\n', [ "unix\nwindows\r\n", "os9\rlast\nnonl" ] ],
|
|
|
|
[ '\r', [ "unix\nwindows\r", "\nos9\r", "last\nnonl" ] ],
|
2007-04-06 14:31:18 -03:00
|
|
|
]
|
2008-12-14 12:36:46 -04:00
|
|
|
encodings = (
|
|
|
|
'utf-8', 'latin-1',
|
|
|
|
'utf-16', 'utf-16-le', 'utf-16-be',
|
|
|
|
'utf-32', 'utf-32-le', 'utf-32-be',
|
|
|
|
)
|
2007-04-06 14:31:18 -03:00
|
|
|
|
2007-08-18 18:39:55 -03:00
|
|
|
# Try a range of buffer sizes to test the case where \r is the last
|
2007-04-06 14:31:18 -03:00
|
|
|
# character in TextIOWrapper._pending_line.
|
|
|
|
for encoding in encodings:
|
2007-08-18 18:39:55 -03:00
|
|
|
# XXX: str.encode() should return bytes
|
|
|
|
data = bytes(''.join(input_lines).encode(encoding))
|
2007-04-06 14:31:18 -03:00
|
|
|
for do_reads in (False, True):
|
2007-08-18 18:39:55 -03:00
|
|
|
for bufsize in range(1, 10):
|
|
|
|
for newline, exp_lines in tests:
|
|
|
|
bufio = io.BufferedReader(io.BytesIO(data), bufsize)
|
2007-04-06 16:10:29 -03:00
|
|
|
textio = io.TextIOWrapper(bufio, newline=newline,
|
2007-04-06 14:31:18 -03:00
|
|
|
encoding=encoding)
|
|
|
|
if do_reads:
|
|
|
|
got_lines = []
|
|
|
|
while True:
|
2007-04-06 16:10:29 -03:00
|
|
|
c2 = textio.read(2)
|
2007-04-06 14:31:18 -03:00
|
|
|
if c2 == '':
|
|
|
|
break
|
|
|
|
self.assertEquals(len(c2), 2)
|
2007-04-06 16:10:29 -03:00
|
|
|
got_lines.append(c2 + textio.readline())
|
2007-04-06 14:31:18 -03:00
|
|
|
else:
|
2007-04-06 16:10:29 -03:00
|
|
|
got_lines = list(textio)
|
2007-04-06 14:31:18 -03:00
|
|
|
|
|
|
|
for got_line, exp_line in zip(got_lines, exp_lines):
|
|
|
|
self.assertEquals(got_line, exp_line)
|
|
|
|
self.assertEquals(len(got_lines), len(exp_lines))
|
|
|
|
|
2007-08-18 18:39:55 -03:00
|
|
|
def testNewlinesInput(self):
|
|
|
|
testdata = b"AAA\nBBB\nCCC\rDDD\rEEE\r\nFFF\r\nGGG"
|
|
|
|
normalized = testdata.replace(b"\r\n", b"\n").replace(b"\r", b"\n")
|
|
|
|
for newline, expected in [
|
2007-11-19 16:34:10 -04:00
|
|
|
(None, normalized.decode("ascii").splitlines(True)),
|
|
|
|
("", testdata.decode("ascii").splitlines(True)),
|
2007-08-18 18:39:55 -03:00
|
|
|
("\n", ["AAA\n", "BBB\n", "CCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]),
|
|
|
|
("\r\n", ["AAA\nBBB\nCCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]),
|
|
|
|
("\r", ["AAA\nBBB\nCCC\r", "DDD\r", "EEE\r", "\nFFF\r", "\nGGG"]),
|
|
|
|
]:
|
|
|
|
buf = io.BytesIO(testdata)
|
2007-11-19 16:34:10 -04:00
|
|
|
txt = io.TextIOWrapper(buf, encoding="ascii", newline=newline)
|
2007-08-18 18:39:55 -03:00
|
|
|
self.assertEquals(txt.readlines(), expected)
|
|
|
|
txt.seek(0)
|
|
|
|
self.assertEquals(txt.read(), "".join(expected))
|
|
|
|
|
|
|
|
def testNewlinesOutput(self):
|
|
|
|
data = "AAA\nBBB\rCCC\n"
|
|
|
|
data_lf = b"AAA\nBBB\rCCC\n"
|
|
|
|
data_cr = b"AAA\rBBB\rCCC\r"
|
|
|
|
data_crlf = b"AAA\r\nBBB\rCCC\r\n"
|
2007-08-18 19:05:58 -03:00
|
|
|
save_linesep = os.linesep
|
|
|
|
try:
|
|
|
|
for os.linesep, newline, expected in [
|
|
|
|
("\n", None, data_lf),
|
|
|
|
("\r\n", None, data_crlf),
|
|
|
|
("\n", "", data_lf),
|
|
|
|
("\r\n", "", data_lf),
|
|
|
|
("\n", "\n", data_lf),
|
|
|
|
("\r\n", "\n", data_lf),
|
|
|
|
("\n", "\r", data_cr),
|
|
|
|
("\r\n", "\r", data_cr),
|
|
|
|
("\n", "\r\n", data_crlf),
|
|
|
|
("\r\n", "\r\n", data_crlf),
|
|
|
|
]:
|
|
|
|
buf = io.BytesIO()
|
2007-11-19 16:34:10 -04:00
|
|
|
txt = io.TextIOWrapper(buf, encoding="ascii", newline=newline)
|
2007-08-18 19:05:58 -03:00
|
|
|
txt.write(data)
|
|
|
|
txt.close()
|
2008-05-06 16:48:38 -03:00
|
|
|
self.assertEquals(buf.closed, True)
|
|
|
|
self.assertRaises(ValueError, buf.getvalue)
|
2007-08-18 19:05:58 -03:00
|
|
|
finally:
|
|
|
|
os.linesep = save_linesep
|
2007-08-18 18:39:55 -03:00
|
|
|
|
2007-04-10 22:09:03 -03:00
|
|
|
# Systematic tests of the text I/O API
|
|
|
|
|
|
|
|
def testBasicIO(self):
|
|
|
|
for chunksize in (1, 2, 3, 4, 5, 15, 16, 17, 31, 32, 33, 63, 64, 65):
|
|
|
|
for enc in "ascii", "latin1", "utf8" :# , "utf-16-be", "utf-16-le":
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "w+", encoding=enc)
|
2007-04-10 22:09:03 -03:00
|
|
|
f._CHUNK_SIZE = chunksize
|
|
|
|
self.assertEquals(f.write("abc"), 3)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "r+", encoding=enc)
|
2007-04-10 22:09:03 -03:00
|
|
|
f._CHUNK_SIZE = chunksize
|
|
|
|
self.assertEquals(f.tell(), 0)
|
|
|
|
self.assertEquals(f.read(), "abc")
|
|
|
|
cookie = f.tell()
|
|
|
|
self.assertEquals(f.seek(0), 0)
|
|
|
|
self.assertEquals(f.read(2), "ab")
|
|
|
|
self.assertEquals(f.read(1), "c")
|
|
|
|
self.assertEquals(f.read(1), "")
|
|
|
|
self.assertEquals(f.read(), "")
|
|
|
|
self.assertEquals(f.tell(), cookie)
|
|
|
|
self.assertEquals(f.seek(0), 0)
|
|
|
|
self.assertEquals(f.seek(0, 2), cookie)
|
|
|
|
self.assertEquals(f.write("def"), 3)
|
|
|
|
self.assertEquals(f.seek(cookie), cookie)
|
|
|
|
self.assertEquals(f.read(), "def")
|
|
|
|
if enc.startswith("utf"):
|
|
|
|
self.multi_line_test(f, enc)
|
|
|
|
f.close()
|
|
|
|
|
|
|
|
def multi_line_test(self, f, enc):
|
|
|
|
f.seek(0)
|
|
|
|
f.truncate()
|
2007-05-02 16:09:54 -03:00
|
|
|
sample = "s\xff\u0fff\uffff"
|
2007-04-10 22:09:03 -03:00
|
|
|
wlines = []
|
2007-04-11 11:19:59 -03:00
|
|
|
for size in (0, 1, 2, 3, 4, 5, 30, 31, 32, 33, 62, 63, 64, 65, 1000):
|
2007-04-10 22:09:03 -03:00
|
|
|
chars = []
|
2007-05-07 19:24:25 -03:00
|
|
|
for i in range(size):
|
2007-04-10 22:09:03 -03:00
|
|
|
chars.append(sample[i % len(sample)])
|
2007-05-02 16:09:54 -03:00
|
|
|
line = "".join(chars) + "\n"
|
2007-04-10 22:09:03 -03:00
|
|
|
wlines.append((f.tell(), line))
|
|
|
|
f.write(line)
|
|
|
|
f.seek(0)
|
|
|
|
rlines = []
|
|
|
|
while True:
|
|
|
|
pos = f.tell()
|
|
|
|
line = f.readline()
|
|
|
|
if not line:
|
|
|
|
break
|
|
|
|
rlines.append((pos, line))
|
|
|
|
self.assertEquals(rlines, wlines)
|
|
|
|
|
2007-04-11 13:07:50 -03:00
|
|
|
def testTelling(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "w+", encoding="utf8")
|
2007-04-11 13:07:50 -03:00
|
|
|
p0 = f.tell()
|
2007-05-02 16:09:54 -03:00
|
|
|
f.write("\xff\n")
|
2007-04-11 13:07:50 -03:00
|
|
|
p1 = f.tell()
|
2007-05-02 16:09:54 -03:00
|
|
|
f.write("\xff\n")
|
2007-04-11 13:07:50 -03:00
|
|
|
p2 = f.tell()
|
|
|
|
f.seek(0)
|
|
|
|
self.assertEquals(f.tell(), p0)
|
2007-05-02 16:09:54 -03:00
|
|
|
self.assertEquals(f.readline(), "\xff\n")
|
2007-04-11 13:07:50 -03:00
|
|
|
self.assertEquals(f.tell(), p1)
|
2007-05-02 16:09:54 -03:00
|
|
|
self.assertEquals(f.readline(), "\xff\n")
|
2007-04-11 13:07:50 -03:00
|
|
|
self.assertEquals(f.tell(), p2)
|
|
|
|
f.seek(0)
|
|
|
|
for line in f:
|
2007-05-02 16:09:54 -03:00
|
|
|
self.assertEquals(line, "\xff\n")
|
2007-04-11 13:07:50 -03:00
|
|
|
self.assertRaises(IOError, f.tell)
|
|
|
|
self.assertEquals(f.tell(), p2)
|
|
|
|
f.close()
|
|
|
|
|
2007-04-16 23:38:04 -03:00
|
|
|
def testSeeking(self):
|
|
|
|
chunk_size = io.TextIOWrapper._CHUNK_SIZE
|
|
|
|
prefix_size = chunk_size - 2
|
2007-05-02 16:09:54 -03:00
|
|
|
u_prefix = "a" * prefix_size
|
2007-04-16 23:38:04 -03:00
|
|
|
prefix = bytes(u_prefix.encode("utf-8"))
|
|
|
|
self.assertEquals(len(u_prefix), len(prefix))
|
2007-05-02 16:09:54 -03:00
|
|
|
u_suffix = "\u8888\n"
|
2007-04-16 23:38:04 -03:00
|
|
|
suffix = bytes(u_suffix.encode("utf-8"))
|
|
|
|
line = prefix + suffix
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb")
|
2007-04-16 23:38:04 -03:00
|
|
|
f.write(line*2)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "r", encoding="utf-8")
|
2007-04-16 23:38:04 -03:00
|
|
|
s = f.read(prefix_size)
|
2007-11-06 17:34:58 -04:00
|
|
|
self.assertEquals(s, str(prefix, "ascii"))
|
2007-04-16 23:38:04 -03:00
|
|
|
self.assertEquals(f.tell(), prefix_size)
|
|
|
|
self.assertEquals(f.readline(), u_suffix)
|
|
|
|
|
|
|
|
def testSeekingToo(self):
|
|
|
|
# Regression test for a specific bug
|
|
|
|
data = b'\xe0\xbf\xbf\n'
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "wb")
|
2007-04-16 23:38:04 -03:00
|
|
|
f.write(data)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "r", encoding="utf-8")
|
2007-04-16 23:38:04 -03:00
|
|
|
f._CHUNK_SIZE # Just test that it exists
|
|
|
|
f._CHUNK_SIZE = 2
|
|
|
|
f.readline()
|
|
|
|
f.tell()
|
|
|
|
|
2008-03-18 01:51:32 -03:00
|
|
|
def testSeekAndTell(self):
|
|
|
|
"""Test seek/tell using the StatefulIncrementalDecoder."""
|
|
|
|
|
|
|
|
def testSeekAndTellWithData(data, min_pos=0):
|
|
|
|
"""Tell/seek to various points within a data stream and ensure
|
|
|
|
that the decoded data returned by read() is consistent."""
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, 'wb')
|
2008-03-18 01:51:32 -03:00
|
|
|
f.write(data)
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, encoding='test_decoder')
|
2008-03-18 01:51:32 -03:00
|
|
|
decoded = f.read()
|
|
|
|
f.close()
|
|
|
|
|
2008-03-18 16:52:05 -03:00
|
|
|
for i in range(min_pos, len(decoded) + 1): # seek positions
|
|
|
|
for j in [1, 5, len(decoded) - i]: # read lengths
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, encoding='test_decoder')
|
2008-03-18 01:51:32 -03:00
|
|
|
self.assertEquals(f.read(i), decoded[:i])
|
|
|
|
cookie = f.tell()
|
|
|
|
self.assertEquals(f.read(j), decoded[i:i + j])
|
|
|
|
f.seek(cookie)
|
|
|
|
self.assertEquals(f.read(), decoded[i:])
|
|
|
|
f.close()
|
|
|
|
|
Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62090 | brett.cannon | 2008-04-01 07:37:43 -0500 (Tue, 01 Apr 2008) | 3 lines
Generalize test.test_support.test_stdout() with a base context manager so that
it is easy to capture stderr if desired.
........
r62091 | brett.cannon | 2008-04-01 07:46:02 -0500 (Tue, 01 Apr 2008) | 3 lines
Add ``if __name__ == '__main__'`` to some test files where it didn't take a lot
of effort to do so.
........
r62096 | amaury.forgeotdarc | 2008-04-01 17:52:48 -0500 (Tue, 01 Apr 2008) | 4 lines
Newly enabled test appears to leak:
it registers the same codec on each iteration.
Do it only once at load time.
........
r62100 | amaury.forgeotdarc | 2008-04-01 19:55:04 -0500 (Tue, 01 Apr 2008) | 4 lines
A DocTestSuite cannot run multiple times: it clears its globals dictionary after the first run.
Rebuild the DocTestSuite on each iteration.
........
r62102 | jeffrey.yasskin | 2008-04-01 23:07:44 -0500 (Tue, 01 Apr 2008) | 3 lines
Try to make test_signal less flaky. I still see some flakiness in
test_itimer_prof.
........
r62110 | vinay.sajip | 2008-04-02 16:09:27 -0500 (Wed, 02 Apr 2008) | 1 line
Fix: #2315, #2316, #2317: TimedRotatingFileHandler - changed logic to better handle daylight savings time, deletion of old log files, and fixed a bug in calculating rollover when no logging occurs for a longer interval than the rollover period.
........
r62111 | vinay.sajip | 2008-04-02 16:10:23 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62112 | vinay.sajip | 2008-04-02 16:17:25 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62113 | amaury.forgeotdarc | 2008-04-02 16:18:46 -0500 (Wed, 02 Apr 2008) | 2 lines
Remove debug prints; the buildbot now passes the tests
........
r62114 | benjamin.peterson | 2008-04-02 16:20:35 -0500 (Wed, 02 Apr 2008) | 2 lines
Suggested proposed changes to Python be considered on some mailing lists first
........
2008-04-02 18:49:44 -03:00
|
|
|
# Enable the test decoder.
|
|
|
|
StatefulIncrementalDecoder.codecEnabled = 1
|
2008-03-18 01:51:32 -03:00
|
|
|
|
|
|
|
# Run the tests.
|
|
|
|
try:
|
|
|
|
# Try each test case.
|
|
|
|
for input, _, _ in StatefulIncrementalDecoderTest.test_cases:
|
|
|
|
testSeekAndTellWithData(input)
|
|
|
|
|
|
|
|
# Position each test case so that it crosses a chunk boundary.
|
|
|
|
CHUNK_SIZE = io.TextIOWrapper._CHUNK_SIZE
|
|
|
|
for input, _, _ in StatefulIncrementalDecoderTest.test_cases:
|
|
|
|
offset = CHUNK_SIZE - len(input)//2
|
|
|
|
prefix = b'.'*offset
|
|
|
|
# Don't bother seeking into the prefix (takes too long).
|
|
|
|
min_pos = offset*2
|
|
|
|
testSeekAndTellWithData(prefix + input, min_pos)
|
|
|
|
|
|
|
|
# Ensure our test decoder won't interfere with subsequent tests.
|
|
|
|
finally:
|
Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62090 | brett.cannon | 2008-04-01 07:37:43 -0500 (Tue, 01 Apr 2008) | 3 lines
Generalize test.test_support.test_stdout() with a base context manager so that
it is easy to capture stderr if desired.
........
r62091 | brett.cannon | 2008-04-01 07:46:02 -0500 (Tue, 01 Apr 2008) | 3 lines
Add ``if __name__ == '__main__'`` to some test files where it didn't take a lot
of effort to do so.
........
r62096 | amaury.forgeotdarc | 2008-04-01 17:52:48 -0500 (Tue, 01 Apr 2008) | 4 lines
Newly enabled test appears to leak:
it registers the same codec on each iteration.
Do it only once at load time.
........
r62100 | amaury.forgeotdarc | 2008-04-01 19:55:04 -0500 (Tue, 01 Apr 2008) | 4 lines
A DocTestSuite cannot run multiple times: it clears its globals dictionary after the first run.
Rebuild the DocTestSuite on each iteration.
........
r62102 | jeffrey.yasskin | 2008-04-01 23:07:44 -0500 (Tue, 01 Apr 2008) | 3 lines
Try to make test_signal less flaky. I still see some flakiness in
test_itimer_prof.
........
r62110 | vinay.sajip | 2008-04-02 16:09:27 -0500 (Wed, 02 Apr 2008) | 1 line
Fix: #2315, #2316, #2317: TimedRotatingFileHandler - changed logic to better handle daylight savings time, deletion of old log files, and fixed a bug in calculating rollover when no logging occurs for a longer interval than the rollover period.
........
r62111 | vinay.sajip | 2008-04-02 16:10:23 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62112 | vinay.sajip | 2008-04-02 16:17:25 -0500 (Wed, 02 Apr 2008) | 1 line
Added updates with respect to recent changes to TimedRotatingFileHandler.
........
r62113 | amaury.forgeotdarc | 2008-04-02 16:18:46 -0500 (Wed, 02 Apr 2008) | 2 lines
Remove debug prints; the buildbot now passes the tests
........
r62114 | benjamin.peterson | 2008-04-02 16:20:35 -0500 (Wed, 02 Apr 2008) | 2 lines
Suggested proposed changes to Python be considered on some mailing lists first
........
2008-04-02 18:49:44 -03:00
|
|
|
StatefulIncrementalDecoder.codecEnabled = 0
|
2008-03-18 01:51:32 -03:00
|
|
|
|
2008-01-07 14:30:48 -04:00
|
|
|
def testEncodedWrites(self):
|
|
|
|
data = "1234567890"
|
|
|
|
tests = ("utf-16",
|
|
|
|
"utf-16-le",
|
|
|
|
"utf-16-be",
|
|
|
|
"utf-32",
|
|
|
|
"utf-32-le",
|
|
|
|
"utf-32-be")
|
|
|
|
for encoding in tests:
|
|
|
|
buf = io.BytesIO()
|
|
|
|
f = io.TextIOWrapper(buf, encoding=encoding)
|
|
|
|
# Check if the BOM is written only once (see issue1753).
|
|
|
|
f.write(data)
|
|
|
|
f.write(data)
|
|
|
|
f.seek(0)
|
|
|
|
self.assertEquals(f.read(), data * 2)
|
|
|
|
self.assertEquals(buf.getvalue(), (data * 2).encode(encoding))
|
|
|
|
|
2007-04-11 13:07:50 -03:00
|
|
|
def timingTest(self):
|
|
|
|
timer = time.time
|
|
|
|
enc = "utf8"
|
2007-05-02 16:09:54 -03:00
|
|
|
line = "\0\x0f\xff\u0fff\uffff\U000fffff\U0010ffff"*3 + "\n"
|
2007-04-11 13:07:50 -03:00
|
|
|
nlines = 10000
|
|
|
|
nchars = len(line)
|
|
|
|
nbytes = len(line.encode(enc))
|
|
|
|
for chunk_size in (32, 64, 128, 256):
|
2008-05-20 18:35:26 -03:00
|
|
|
f = io.open(support.TESTFN, "w+", encoding=enc)
|
2007-04-11 13:07:50 -03:00
|
|
|
f._CHUNK_SIZE = chunk_size
|
|
|
|
t0 = timer()
|
|
|
|
for i in range(nlines):
|
|
|
|
f.write(line)
|
|
|
|
f.flush()
|
|
|
|
t1 = timer()
|
|
|
|
f.seek(0)
|
|
|
|
for line in f:
|
|
|
|
pass
|
|
|
|
t2 = timer()
|
|
|
|
f.seek(0)
|
|
|
|
while f.readline():
|
|
|
|
pass
|
|
|
|
t3 = timer()
|
|
|
|
f.seek(0)
|
|
|
|
while f.readline():
|
|
|
|
f.tell()
|
|
|
|
t4 = timer()
|
|
|
|
f.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
if support.verbose:
|
2007-04-11 13:07:50 -03:00
|
|
|
print("\nTiming test: %d lines of %d characters (%d bytes)" %
|
|
|
|
(nlines, nchars, nbytes))
|
|
|
|
print("File chunk size: %6s" % f._CHUNK_SIZE)
|
|
|
|
print("Writing: %6.3f seconds" % (t1-t0))
|
|
|
|
print("Reading using iteration: %6.3f seconds" % (t2-t1))
|
|
|
|
print("Reading using readline(): %6.3f seconds" % (t3-t2))
|
|
|
|
print("Using readline()+tell(): %6.3f seconds" % (t4-t3))
|
|
|
|
|
2007-11-19 16:34:10 -04:00
|
|
|
def testReadOneByOne(self):
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(b"AA\r\nBB"))
|
|
|
|
reads = ""
|
|
|
|
while True:
|
|
|
|
c = txt.read(1)
|
|
|
|
if not c:
|
|
|
|
break
|
|
|
|
reads += c
|
|
|
|
self.assertEquals(reads, "AA\nBB")
|
|
|
|
|
|
|
|
# read in amounts equal to TextIOWrapper._CHUNK_SIZE which is 128.
|
|
|
|
def testReadByChunk(self):
|
|
|
|
# make sure "\r\n" straddles 128 char boundary.
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(b"A" * 127 + b"\r\nB"))
|
|
|
|
reads = ""
|
|
|
|
while True:
|
|
|
|
c = txt.read(128)
|
|
|
|
if not c:
|
|
|
|
break
|
|
|
|
reads += c
|
|
|
|
self.assertEquals(reads, "A"*127+"\nB")
|
|
|
|
|
|
|
|
def test_issue1395_1(self):
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(self.testdata), encoding="ascii")
|
|
|
|
|
|
|
|
# read one char at a time
|
|
|
|
reads = ""
|
|
|
|
while True:
|
|
|
|
c = txt.read(1)
|
|
|
|
if not c:
|
|
|
|
break
|
|
|
|
reads += c
|
|
|
|
self.assertEquals(reads, self.normalized)
|
|
|
|
|
|
|
|
def test_issue1395_2(self):
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(self.testdata), encoding="ascii")
|
|
|
|
txt._CHUNK_SIZE = 4
|
|
|
|
|
|
|
|
reads = ""
|
|
|
|
while True:
|
|
|
|
c = txt.read(4)
|
|
|
|
if not c:
|
|
|
|
break
|
|
|
|
reads += c
|
|
|
|
self.assertEquals(reads, self.normalized)
|
|
|
|
|
|
|
|
def test_issue1395_3(self):
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(self.testdata), encoding="ascii")
|
|
|
|
txt._CHUNK_SIZE = 4
|
|
|
|
|
|
|
|
reads = txt.read(4)
|
|
|
|
reads += txt.read(4)
|
|
|
|
reads += txt.readline()
|
|
|
|
reads += txt.readline()
|
|
|
|
reads += txt.readline()
|
|
|
|
self.assertEquals(reads, self.normalized)
|
|
|
|
|
|
|
|
def test_issue1395_4(self):
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(self.testdata), encoding="ascii")
|
|
|
|
txt._CHUNK_SIZE = 4
|
|
|
|
|
|
|
|
reads = txt.read(4)
|
|
|
|
reads += txt.read()
|
|
|
|
self.assertEquals(reads, self.normalized)
|
|
|
|
|
|
|
|
def test_issue1395_5(self):
|
|
|
|
txt = io.TextIOWrapper(io.BytesIO(self.testdata), encoding="ascii")
|
|
|
|
txt._CHUNK_SIZE = 4
|
|
|
|
|
|
|
|
reads = txt.read(4)
|
|
|
|
pos = txt.tell()
|
|
|
|
txt.seek(0)
|
|
|
|
txt.seek(pos)
|
|
|
|
self.assertEquals(txt.read(4), "BBB\n")
|
|
|
|
|
2008-03-17 17:35:15 -03:00
|
|
|
def test_issue2282(self):
|
|
|
|
buffer = io.BytesIO(self.testdata)
|
|
|
|
txt = io.TextIOWrapper(buffer, encoding="ascii")
|
|
|
|
|
|
|
|
self.assertEqual(buffer.seekable(), txt.seekable())
|
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
def check_newline_decoder_utf8(self, decoder):
|
|
|
|
# UTF-8 specific tests for a newline decoder
|
|
|
|
def _check_decode(b, s, **kwargs):
|
|
|
|
# We exercise getstate() / setstate() as well as decode()
|
|
|
|
state = decoder.getstate()
|
|
|
|
self.assertEquals(decoder.decode(b, **kwargs), s)
|
|
|
|
decoder.setstate(state)
|
|
|
|
self.assertEquals(decoder.decode(b, **kwargs), s)
|
2007-11-19 16:34:10 -04:00
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
_check_decode(b'\xe8\xa2\x88', "\u8888")
|
2007-11-19 16:34:10 -04:00
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
_check_decode(b'\xe8', "")
|
|
|
|
_check_decode(b'\xa2', "")
|
|
|
|
_check_decode(b'\x88', "\u8888")
|
2007-11-19 16:34:10 -04:00
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
_check_decode(b'\xe8', "")
|
|
|
|
_check_decode(b'\xa2', "")
|
|
|
|
_check_decode(b'\x88', "\u8888")
|
2007-11-19 16:34:10 -04:00
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
_check_decode(b'\xe8', "")
|
|
|
|
self.assertRaises(UnicodeDecodeError, decoder.decode, b'', final=True)
|
2007-04-10 22:09:03 -03:00
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
decoder.reset()
|
|
|
|
_check_decode(b'\n', "\n")
|
|
|
|
_check_decode(b'\r', "")
|
|
|
|
_check_decode(b'', "\n", final=True)
|
|
|
|
_check_decode(b'\r', "\n", final=True)
|
|
|
|
|
|
|
|
_check_decode(b'\r', "")
|
|
|
|
_check_decode(b'a', "\na")
|
|
|
|
|
|
|
|
_check_decode(b'\r\r\n', "\n\n")
|
|
|
|
_check_decode(b'\r', "")
|
|
|
|
_check_decode(b'\r', "\n")
|
|
|
|
_check_decode(b'\na', "\na")
|
|
|
|
|
|
|
|
_check_decode(b'\xe8\xa2\x88\r\n', "\u8888\n")
|
|
|
|
_check_decode(b'\xe8\xa2\x88', "\u8888")
|
|
|
|
_check_decode(b'\n', "\n")
|
|
|
|
_check_decode(b'\xe8\xa2\x88\r', "\u8888")
|
|
|
|
_check_decode(b'\n', "\n")
|
|
|
|
|
|
|
|
def check_newline_decoder(self, decoder, encoding):
|
|
|
|
result = []
|
|
|
|
encoder = codecs.getincrementalencoder(encoding)()
|
|
|
|
def _decode_bytewise(s):
|
|
|
|
for b in encoder.encode(s):
|
|
|
|
result.append(decoder.decode(bytes([b])))
|
2008-01-05 20:34:32 -04:00
|
|
|
self.assertEquals(decoder.newlines, None)
|
2008-12-14 12:36:46 -04:00
|
|
|
_decode_bytewise("abc\n\r")
|
2008-01-05 20:34:32 -04:00
|
|
|
self.assertEquals(decoder.newlines, '\n')
|
2008-12-14 12:36:46 -04:00
|
|
|
_decode_bytewise("\nabc")
|
2008-01-05 20:34:32 -04:00
|
|
|
self.assertEquals(decoder.newlines, ('\n', '\r\n'))
|
2008-12-14 12:36:46 -04:00
|
|
|
_decode_bytewise("abc\r")
|
2008-01-05 20:34:32 -04:00
|
|
|
self.assertEquals(decoder.newlines, ('\n', '\r\n'))
|
2008-12-14 12:36:46 -04:00
|
|
|
_decode_bytewise("abc")
|
2008-01-05 20:34:32 -04:00
|
|
|
self.assertEquals(decoder.newlines, ('\r', '\n', '\r\n'))
|
2008-12-14 12:36:46 -04:00
|
|
|
_decode_bytewise("abc\r")
|
|
|
|
self.assertEquals("".join(result), "abc\n\nabcabc\nabcabc")
|
2008-01-05 20:34:32 -04:00
|
|
|
decoder.reset()
|
2008-12-14 12:36:46 -04:00
|
|
|
self.assertEquals(decoder.decode("abc".encode(encoding)), "abc")
|
2008-01-05 20:34:32 -04:00
|
|
|
self.assertEquals(decoder.newlines, None)
|
|
|
|
|
2008-12-14 12:36:46 -04:00
|
|
|
def test_newline_decoder(self):
|
|
|
|
encodings = (
|
|
|
|
'utf-8', 'latin-1',
|
|
|
|
'utf-16', 'utf-16-le', 'utf-16-be',
|
|
|
|
'utf-32', 'utf-32-le', 'utf-32-be',
|
|
|
|
)
|
|
|
|
for enc in encodings:
|
|
|
|
decoder = codecs.getincrementaldecoder(enc)()
|
|
|
|
decoder = io.IncrementalNewlineDecoder(decoder, translate=True)
|
|
|
|
self.check_newline_decoder(decoder, enc)
|
|
|
|
decoder = codecs.getincrementaldecoder("utf-8")()
|
|
|
|
decoder = io.IncrementalNewlineDecoder(decoder, translate=True)
|
|
|
|
self.check_newline_decoder_utf8(decoder)
|
|
|
|
|
|
|
|
|
2007-03-06 21:00:12 -04:00
|
|
|
# XXX Tests for open()
|
2007-02-27 13:19:33 -04:00
|
|
|
|
2007-08-27 14:39:33 -03:00
|
|
|
class MiscIOTest(unittest.TestCase):
|
|
|
|
|
2008-11-20 16:14:50 -04:00
|
|
|
def tearDown(self):
|
|
|
|
support.unlink(support.TESTFN)
|
|
|
|
|
2007-08-27 14:39:33 -03:00
|
|
|
def testImport__all__(self):
|
|
|
|
for name in io.__all__:
|
|
|
|
obj = getattr(io, name, None)
|
|
|
|
self.assert_(obj is not None, name)
|
|
|
|
if name == "open":
|
|
|
|
continue
|
|
|
|
elif "error" in name.lower():
|
|
|
|
self.assert_(issubclass(obj, Exception), name)
|
|
|
|
else:
|
|
|
|
self.assert_(issubclass(obj, io.IOBase))
|
|
|
|
|
2008-11-05 17:42:45 -04:00
|
|
|
|
2008-11-20 16:14:50 -04:00
|
|
|
def test_attributes(self):
|
|
|
|
f = io.open(support.TESTFN, "wb", buffering=0)
|
2008-11-21 20:41:45 -04:00
|
|
|
self.assertEquals(f.mode, "wb")
|
2008-11-20 16:14:50 -04:00
|
|
|
f.close()
|
|
|
|
|
|
|
|
f = io.open(support.TESTFN, "U")
|
|
|
|
self.assertEquals(f.name, support.TESTFN)
|
|
|
|
self.assertEquals(f.buffer.name, support.TESTFN)
|
|
|
|
self.assertEquals(f.buffer.raw.name, support.TESTFN)
|
|
|
|
self.assertEquals(f.mode, "U")
|
2008-11-21 20:41:45 -04:00
|
|
|
self.assertEquals(f.buffer.mode, "rb")
|
|
|
|
self.assertEquals(f.buffer.raw.mode, "rb")
|
2008-11-20 16:14:50 -04:00
|
|
|
f.close()
|
|
|
|
|
|
|
|
f = io.open(support.TESTFN, "w+")
|
|
|
|
self.assertEquals(f.mode, "w+")
|
2008-11-21 20:41:45 -04:00
|
|
|
self.assertEquals(f.buffer.mode, "rb+") # Does it really matter?
|
|
|
|
self.assertEquals(f.buffer.raw.mode, "rb+")
|
2008-11-20 16:14:50 -04:00
|
|
|
|
|
|
|
g = io.open(f.fileno(), "wb", closefd=False)
|
2008-11-21 20:41:45 -04:00
|
|
|
self.assertEquals(g.mode, "wb")
|
|
|
|
self.assertEquals(g.raw.mode, "wb")
|
2008-11-20 16:14:50 -04:00
|
|
|
self.assertEquals(g.name, f.fileno())
|
|
|
|
self.assertEquals(g.raw.name, f.fileno())
|
|
|
|
f.close()
|
|
|
|
g.close()
|
|
|
|
|
|
|
|
|
2007-02-27 01:47:44 -04:00
|
|
|
def test_main():
|
2008-05-20 18:35:26 -03:00
|
|
|
support.run_unittest(IOTest, BytesIOTest, StringIOTest,
|
Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r62425 | andrew.kuchling | 2008-04-21 03:45:57 +0200 (Mon, 21 Apr 2008) | 1 line
Comment typo
................
r62426 | mark.dickinson | 2008-04-21 03:55:50 +0200 (Mon, 21 Apr 2008) | 2 lines
Silence 'r may be used uninitialized' compiler warning.
................
r62427 | andrew.kuchling | 2008-04-21 04:08:00 +0200 (Mon, 21 Apr 2008) | 1 line
Markup fix
................
r62428 | andrew.kuchling | 2008-04-21 04:08:13 +0200 (Mon, 21 Apr 2008) | 1 line
Wording changes
................
r62429 | andrew.kuchling | 2008-04-21 04:14:24 +0200 (Mon, 21 Apr 2008) | 1 line
Add various items
................
r62434 | thomas.heller | 2008-04-21 15:46:55 +0200 (Mon, 21 Apr 2008) | 1 line
Fix typo.
................
r62435 | david.goodger | 2008-04-21 16:40:22 +0200 (Mon, 21 Apr 2008) | 1 line
corrections ("reStructuredText" is one word)
................
r62436 | david.goodger | 2008-04-21 16:43:33 +0200 (Mon, 21 Apr 2008) | 1 line
capitalization
................
r62441 | gregory.p.smith | 2008-04-21 19:46:40 +0200 (Mon, 21 Apr 2008) | 2 lines
explicitly flush after the ... since there wasn't a newline
................
r62444 | jeroen.ruigrok | 2008-04-21 22:15:39 +0200 (Mon, 21 Apr 2008) | 2 lines
Windows x64 also falls under VER_PLATFORM_WIN32_NT.
................
r62446 | gregory.p.smith | 2008-04-21 23:31:08 +0200 (Mon, 21 Apr 2008) | 3 lines
If sys.stdin is not a tty, fall back to default_getpass after printing
a warning instead of failing with a termios.error.
................
r62447 | mark.dickinson | 2008-04-22 00:32:24 +0200 (Tue, 22 Apr 2008) | 8 lines
test_math and test_cmath are failing on the FreeBSD 6.2 trunk buildbot,
apparently because tanh(-0.) loses the sign of zero on that platform.
If true, this is a bug in FreeBSD.
Added a configure test to verify this. I still need to figure out
how best to deal with this failure.
................
r62448 | amaury.forgeotdarc | 2008-04-22 00:35:30 +0200 (Tue, 22 Apr 2008) | 7 lines
Issue 2665: On Windows, sys.stderr does not contain a valid file when running without a console.
It seems to work, but will fail at the first flush.
This causes IDLE to crash when too many warnings are printed.
Will backport.
................
r62450 | benjamin.peterson | 2008-04-22 00:57:00 +0200 (Tue, 22 Apr 2008) | 2 lines
Fix Sphinx warnings
................
r62451 | mark.dickinson | 2008-04-22 02:54:27 +0200 (Tue, 22 Apr 2008) | 3 lines
Make configure test for tanh(-0.) == -0. committed in r62447 actually
work. (The test wasn't properly linked with libm. Sigh.)
................
r62452 | benjamin.peterson | 2008-04-22 04:16:03 +0200 (Tue, 22 Apr 2008) | 2 lines
Various io doc updates
................
r62453 | neal.norwitz | 2008-04-22 07:07:47 +0200 (Tue, 22 Apr 2008) | 1 line
Add Thomas Lee
................
r62454 | gregory.p.smith | 2008-04-22 10:08:41 +0200 (Tue, 22 Apr 2008) | 8 lines
Major improvements:
* Default to using /dev/tty for the password prompt and input before
falling back to sys.stdin and sys.stderr.
* Use sys.stderr instead of sys.stdout.
* print the 'password may be echoed' warning to stream used to display
the prompt rather than always sys.stderr.
* warn() with GetPassWarning when input may be echoed.
................
r62455 | gregory.p.smith | 2008-04-22 10:11:33 +0200 (Tue, 22 Apr 2008) | 2 lines
update the getpass entry
................
r62463 | amaury.forgeotdarc | 2008-04-22 23:14:41 +0200 (Tue, 22 Apr 2008) | 5 lines
Issue #2670: urllib2.build_opener() failed when two handlers
derive the same default base class.
Will backport.
................
r62465 | skip.montanaro | 2008-04-23 00:45:09 +0200 (Wed, 23 Apr 2008) | 3 lines
Factor in documentation changes from issue 1753732.
................
r62466 | gregory.p.smith | 2008-04-23 03:06:42 +0200 (Wed, 23 Apr 2008) | 2 lines
syntax fixup
................
r62469 | benjamin.peterson | 2008-04-23 22:38:06 +0200 (Wed, 23 Apr 2008) | 2 lines
#2673 Fix example typo in optparse docs
................
r62474 | martin.v.loewis | 2008-04-24 11:50:50 +0200 (Thu, 24 Apr 2008) | 2 lines
Add Guilherme Polo.
................
r62476 | martin.v.loewis | 2008-04-24 15:16:36 +0200 (Thu, 24 Apr 2008) | 3 lines
Remove Py_Refcnt, Py_Type, Py_Size, as they were added only
for backwards compatibility, yet 2.5 did not have them at all.
................
r62477 | martin.v.loewis | 2008-04-24 15:17:24 +0200 (Thu, 24 Apr 2008) | 2 lines
Fix typo.
................
r62478 | martin.v.loewis | 2008-04-24 15:18:03 +0200 (Thu, 24 Apr 2008) | 2 lines
Add Jesus Cea.
................
r62480 | amaury.forgeotdarc | 2008-04-24 20:07:05 +0200 (Thu, 24 Apr 2008) | 4 lines
Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0).
This happened only when 8 is the first digit.
Credits go to Lukas Meuser.
................
r62485 | amaury.forgeotdarc | 2008-04-24 22:10:26 +0200 (Thu, 24 Apr 2008) | 5 lines
Disable gc when running test_trace, or we may record the __del__ of collected objects.
See http://mail.python.org/pipermail/python-checkins/2008-April/068633.html
the extra events perfectly match several calls to socket._fileobject.__del__()
................
r62492 | neal.norwitz | 2008-04-25 05:40:17 +0200 (Fri, 25 Apr 2008) | 1 line
Fix typo (now -> no)
................
r62497 | armin.rigo | 2008-04-25 11:35:18 +0200 (Fri, 25 Apr 2008) | 2 lines
A new crasher.
................
r62498 | thomas.heller | 2008-04-25 17:44:16 +0200 (Fri, 25 Apr 2008) | 1 line
Add from_buffer and from_buffer_copy class methods to ctypes types.
................
r62500 | mark.dickinson | 2008-04-25 18:59:09 +0200 (Fri, 25 Apr 2008) | 3 lines
Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill.
................
r62507 | benjamin.peterson | 2008-04-25 23:43:56 +0200 (Fri, 25 Apr 2008) | 2 lines
Allow test_import to work when it is invoked directly
................
r62513 | georg.brandl | 2008-04-26 20:31:07 +0200 (Sat, 26 Apr 2008) | 2 lines
#2691: document PyLong (s)size_t APIs, patch by Alexander Belopolsky.
................
r62514 | georg.brandl | 2008-04-26 20:32:17 +0200 (Sat, 26 Apr 2008) | 2 lines
Add missing return type to dealloc.
................
r62516 | alexandre.vassalotti | 2008-04-27 02:52:24 +0200 (Sun, 27 Apr 2008) | 2 lines
Fixed URL of PEP 205 in weakref's module docstring.
................
r62521 | georg.brandl | 2008-04-27 11:39:59 +0200 (Sun, 27 Apr 2008) | 2 lines
#2677: add note that not all functions may accept keyword args.
................
r62531 | georg.brandl | 2008-04-27 19:38:55 +0200 (Sun, 27 Apr 2008) | 2 lines
Use correct XHTML tags.
................
r62535 | benjamin.peterson | 2008-04-27 20:14:39 +0200 (Sun, 27 Apr 2008) | 2 lines
#2700 Document PyNumber_ToBase
................
r62545 | skip.montanaro | 2008-04-27 22:53:57 +0200 (Sun, 27 Apr 2008) | 1 line
minor wording changes, rewrap a few lines
................
r62546 | kurt.kaiser | 2008-04-27 23:07:41 +0200 (Sun, 27 Apr 2008) | 7 lines
Home / Control-A toggles between left margin and end of leading white
space. Patch 1196903 Jeff Shute.
M idlelib/PyShell.py
M idlelib/EditorWindow.py
M idlelib/NEWS.txt
................
r62548 | kurt.kaiser | 2008-04-27 23:38:05 +0200 (Sun, 27 Apr 2008) | 2 lines
Improved AutoCompleteWindow logic. Patch 2062 Tal Einat.
................
r62549 | kurt.kaiser | 2008-04-27 23:52:19 +0200 (Sun, 27 Apr 2008) | 4 lines
Autocompletion of filenames now support alternate separators, e.g. the
'/' char on Windows. Patch 2061 Tal Einat.
................
r62550 | skip.montanaro | 2008-04-28 00:49:56 +0200 (Mon, 28 Apr 2008) | 6 lines
A few small changes:
* The only exception we should catch when trying to import cStringIO is an
ImportError.
* Delete the function signatures embedded in the mk*temp docstrings.
* The tempdir global variable was initialized twice.
................
r62551 | skip.montanaro | 2008-04-28 00:52:02 +0200 (Mon, 28 Apr 2008) | 4 lines
Wrap some long paragraphs and include the default values for optional
function parameters.
................
r62553 | skip.montanaro | 2008-04-28 04:57:23 +0200 (Mon, 28 Apr 2008) | 7 lines
Minor cleanups:
* Avoid creating unused local variables where we can. Where we can't prefix
the unused variables with '_'.
* Avoid shadowing builtins where it won't change the external interface of a
function.
* Use None as default path arg to readmodule and readmodule_ex.
................
r62554 | skip.montanaro | 2008-04-28 04:59:45 +0200 (Mon, 28 Apr 2008) | 6 lines
Correct documentation to match implementation: "Class" instead of
"class_descriptor", "Function" instead of "function_descriptor". Note
default path value for readmodule*. Wrap some long paragraphs. Don't
mention 'inpackage' which isn't part of the public API.
................
r62555 | brett.cannon | 2008-04-28 05:23:50 +0200 (Mon, 28 Apr 2008) | 5 lines
Fix a bug introduced by the warnings rewrite where tracebacks were being
improperly indented.
Closes issue #2699.
................
r62556 | skip.montanaro | 2008-04-28 05:25:37 +0200 (Mon, 28 Apr 2008) | 2 lines
Wrap some long lines.
................
r62557 | skip.montanaro | 2008-04-28 05:27:53 +0200 (Mon, 28 Apr 2008) | 6 lines
Get rid of _test(), _main(), _debug() and _check(). Tests are no longer
needed (better set available in Lib/test/test_robotparser.py). Clean up a
few PEP 8 nits (compound statements on a single line, whitespace around
operators).
................
r62558 | brett.cannon | 2008-04-28 06:50:06 +0200 (Mon, 28 Apr 2008) | 3 lines
Rename the test_traceback_print() function to traceback_print() to prevent
test_capi from automatically calling the function.
................
r62559 | georg.brandl | 2008-04-28 07:16:30 +0200 (Mon, 28 Apr 2008) | 2 lines
Fix markup.
................
r62569 | amaury.forgeotdarc | 2008-04-28 23:07:06 +0200 (Mon, 28 Apr 2008) | 5 lines
test_sundry performs minimal tests (a simple import...) on modules that are not tested otherwise.
Some of them now have tests and can be removed.
Only 70 to go...
................
r62574 | andrew.kuchling | 2008-04-29 04:03:54 +0200 (Tue, 29 Apr 2008) | 1 line
Strip down SSL docs; I'm not managing to get test programs working, so I'll just give a minimal description
................
r62577 | martin.v.loewis | 2008-04-29 08:10:53 +0200 (Tue, 29 Apr 2008) | 2 lines
Add Rodrigo and Heiko.
................
r62593 | nick.coghlan | 2008-04-30 16:23:36 +0200 (Wed, 30 Apr 2008) | 1 line
Update command line usage documentation to reflect 2.6 changes (also includes some minor cleanups). Addresses TODO list issue 2258
................
r62595 | andrew.kuchling | 2008-04-30 18:19:55 +0200 (Wed, 30 Apr 2008) | 1 line
Typo fix
................
r62604 | benjamin.peterson | 2008-04-30 23:03:58 +0200 (Wed, 30 Apr 2008) | 2 lines
make test_support's captured_output a bit more robust when exceptions happen
................
r62605 | georg.brandl | 2008-04-30 23:08:42 +0200 (Wed, 30 Apr 2008) | 2 lines
#1748: use functools.wraps instead of rolling own metadata update.
................
r62606 | benjamin.peterson | 2008-04-30 23:25:55 +0200 (Wed, 30 Apr 2008) | 2 lines
Remove some from __future__ import with_statements
................
r62608 | benjamin.peterson | 2008-05-01 00:03:36 +0200 (Thu, 01 May 2008) | 2 lines
Fix typo in whatsnew
................
r62616 | georg.brandl | 2008-05-01 20:24:32 +0200 (Thu, 01 May 2008) | 2 lines
Fix synopsis.
................
r62626 | brett.cannon | 2008-05-02 04:25:09 +0200 (Fri, 02 May 2008) | 6 lines
Fix a backwards-compatibility mistake where a new optional argument for
warnings.showwarning() was being used. This broke pre-existing replacements for
the function since they didn't support the extra argument.
Closes issue 2705.
................
r62627 | gregory.p.smith | 2008-05-02 09:26:52 +0200 (Fri, 02 May 2008) | 20 lines
This should fix issue2632. A long description of the two competing
problems is in the bug report (one old, one recently introduced trying
to fix the old one). In short:
buffer data during socket._fileobject.read() and readlines() within a
cStringIO object instead of a [] of str()s returned from the recv()
call.
This prevents excessive memory use due to the size parameter being
passed to recv() being grossly larger than the actual size of the data
returned *and* prevents excessive cpu usage due to looping in python
calling recv() with a very tiny size value if min() is used as the
previous memory-use bug "fix" did.
It also documents what the socket._fileobject._rbufsize member is
actually used for.
This is a candidate for back porting to 2.5.
................
r62636 | mark.hammond | 2008-05-02 14:48:15 +0200 (Fri, 02 May 2008) | 2 lines
#2581: Vista UAC/elevation support for bdist_wininst
................
r62638 | facundo.batista | 2008-05-02 19:39:00 +0200 (Fri, 02 May 2008) | 3 lines
Fixed some test structures. Thanks Mark Dickinson.
................
r62644 | ronald.oussoren | 2008-05-02 21:45:11 +0200 (Fri, 02 May 2008) | 7 lines
Fix for issue #2573: Can't change the framework name on OS X builds
This introduces a new configure option: --with-framework-name=NAME
(defaulting to 'Python'). This allows you to install several copies
of the Python framework with different names (such as a normal build
and a debug build).
................
r62645 | ronald.oussoren | 2008-05-02 21:58:56 +0200 (Fri, 02 May 2008) | 2 lines
Finish fix for issue2573, previous patch was incomplete.
................
r62647 | martin.v.loewis | 2008-05-02 23:30:20 +0200 (Fri, 02 May 2008) | 13 lines
Merged revisions 62263-62646 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r62470 | david.wolever | 2008-04-24 02:11:07 +0200 (Do, 24 Apr 2008) | 3 lines
Fixed up and applied the patch for #2431 -- speeding up 2to3 with a lookup table.
........
r62646 | martin.v.loewis | 2008-05-02 23:29:27 +0200 (Fr, 02 Mai 2008) | 2 lines
Fix whitespace.
........
................
r62648 | ronald.oussoren | 2008-05-02 23:42:35 +0200 (Fri, 02 May 2008) | 4 lines
Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard
This fixes both Python Launchar and the terminalcommand module.
................
r62651 | ronald.oussoren | 2008-05-02 23:54:56 +0200 (Fri, 02 May 2008) | 2 lines
Fix for issue #2520 (cannot import macerrors)
................
r62652 | benjamin.peterson | 2008-05-03 00:12:58 +0200 (Sat, 03 May 2008) | 2 lines
capitalization nit for reStructuredText
................
r62653 | brett.cannon | 2008-05-03 03:02:41 +0200 (Sat, 03 May 2008) | 2 lines
Fix some indentation errors.
................
r62656 | brett.cannon | 2008-05-03 05:19:39 +0200 (Sat, 03 May 2008) | 6 lines
Fix the C implementation of 'warnings' to infer the filename of the module that
raised an exception properly when __file__ is not set, __name__ == '__main__',
and sys.argv[0] is a false value.
Closes issue2743.
................
r62661 | amaury.forgeotdarc | 2008-05-03 14:21:13 +0200 (Sat, 03 May 2008) | 8 lines
In test_io, StatefulIncrementalDecoderTest was not part of the test suite.
And of course, the test failed:
a bytearray was used without reason in io.TextIOWrapper.tell().
The difference is that iterating over bytes (i.e. str in python2.6) returns 1-char bytes,
whereas bytearrays yield integers.
This code should still work with python3.0
................
r62663 | benjamin.peterson | 2008-05-03 17:56:42 +0200 (Sat, 03 May 2008) | 2 lines
The compiling struct is now passed around to all AST helpers (see issue 2720)
................
r62680 | benjamin.peterson | 2008-05-03 23:35:18 +0200 (Sat, 03 May 2008) | 2 lines
Moved testing of builtin types out of test_builtin and into type specific modules
................
r62686 | mark.dickinson | 2008-05-04 04:25:46 +0200 (Sun, 04 May 2008) | 4 lines
Make sure that Context traps and flags dictionaries have values 0 and 1
(as documented) rather than True and False.
................
r62687 | benjamin.peterson | 2008-05-04 05:05:49 +0200 (Sun, 04 May 2008) | 2 lines
Fix typo in whatsnew
................
r62696 | georg.brandl | 2008-05-04 11:15:04 +0200 (Sun, 04 May 2008) | 2 lines
#2752: wrong meaning of '' for socket host.
................
r62699 | christian.heimes | 2008-05-04 13:50:53 +0200 (Sun, 04 May 2008) | 1 line
Added note that Python requires at least Win2k SP4
................
r62700 | gerhard.haering | 2008-05-04 14:59:57 +0200 (Sun, 04 May 2008) | 3 lines
SQLite requires 64-bit integers in order to build. So the whole HAVE_LONG_LONG
#ifdefing was useless.
................
r62701 | gerhard.haering | 2008-05-04 15:15:12 +0200 (Sun, 04 May 2008) | 3 lines
Applied sqliterow-richcmp.diff patch from Thomas Heller in Issue2152. The
sqlite3.Row type is now correctly hashable.
................
r62702 | gerhard.haering | 2008-05-04 15:42:44 +0200 (Sun, 04 May 2008) | 5 lines
Implemented feature request 2157: Converter names are cut off at '('
characters. This avoids the common case of something like 'NUMBER(10)' not
being parsed as 'NUMBER', like expected. Also corrected the docs about
converter names being case-sensitive. They aren't any longer.
................
r62703 | georg.brandl | 2008-05-04 17:45:05 +0200 (Sun, 04 May 2008) | 2 lines
#2757: Remove spare newline.
................
r62711 | benjamin.peterson | 2008-05-04 21:10:02 +0200 (Sun, 04 May 2008) | 2 lines
Fix typo in bugs.rst
................
2008-05-04 19:42:01 -03:00
|
|
|
BufferedReaderTest, BufferedWriterTest,
|
|
|
|
BufferedRWPairTest, BufferedRandomTest,
|
|
|
|
StatefulIncrementalDecoderTest,
|
|
|
|
TextIOWrapperTest, MiscIOTest)
|
2007-02-27 01:47:44 -04:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
2007-04-06 16:10:29 -03:00
|
|
|
unittest.main()
|