diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-01 20:29:34 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-01 20:29:34 (GMT) |
| commit | 1ce3eb5c5b4830e69b21865e2d723e22749544e0 (patch) | |
| tree | 324241bc0190ec3316b48ae4f5bd5b20e101bcf0 /Lib/test/test_file.py | |
| parent | 42cb4626820e466177e49c283e37e15375c3efed (diff) | |
| download | cpython-1ce3eb5c5b4830e69b21865e2d723e22749544e0.zip cpython-1ce3eb5c5b4830e69b21865e2d723e22749544e0.tar.gz cpython-1ce3eb5c5b4830e69b21865e2d723e22749544e0.tar.bz2 | |
Issue #8990: array.fromstring() and array.tostring() get renamed to
frombytes() and tobytes(), respectively, to avoid confusion. Furthermore,
array.frombytes(), array.extend() as well as the array.array()
constructor now accept bytearray objects. Patch by Thomas Jollans.
Diffstat (limited to 'Lib/test/test_file.py')
| -rw-r--r-- | Lib/test/test_file.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py index 6d51fd5..ebaa38b 100644 --- a/Lib/test/test_file.py +++ b/Lib/test/test_file.py @@ -44,7 +44,7 @@ class AutoFileTests(unittest.TestCase): a = array('b', b'x'*10) self.f = self.open(TESTFN, 'rb') n = self.f.readinto(a) - self.assertEquals(b'12', a.tostring()[:n]) + self.assertEquals(b'12', a.tobytes()[:n]) def testReadinto_text(self): # verify readinto refuses text files @@ -281,7 +281,7 @@ class OtherFileTests(unittest.TestCase): except ValueError: self.fail("readinto() after next() with supposedly empty " "iteration-buffer failed anyway") - line = buf.tostring() + line = buf.tobytes() if line != testline: self.fail("readinto() after next() with empty buffer " "failed. Got %r, expected %r" % (line, testline)) |