From dfdcf49d20df8d005fa303ee1e40bfeb4a9a3deb Mon Sep 17 00:00:00 2001 From: sroet Date: Mon, 20 Jul 2020 17:00:34 +0200 Subject: [PATCH] convert 'array.tostring()' to 'array.tobytes()' --- tables/atom.py | 4 +- tables/nodes/filenode.py | 2 +- tables/tests/test_tables.py | 94 +++++++++++++++++------------------ tables/tests/test_tablesMD.py | 60 +++++++++++----------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/tables/atom.py b/tables/atom.py index f92e16ad5..a76b6b2e7 100644 --- a/tables/atom.py +++ b/tables/atom.py @@ -1130,7 +1130,7 @@ def _tobuffer(self, object_): return numpy.string_(object_) def fromarray(self, array): - return array.tostring() + return array.tobytes() class VLUnicodeAtom(_BufferedAtom): @@ -1221,4 +1221,4 @@ def fromarray(self, array): # record when in fact it is empty. if array.size == 0: return None - return pickle.loads(array.tostring()) + return pickle.loads(array.tobytes()) diff --git a/tables/nodes/filenode.py b/tables/nodes/filenode.py index d1697377a..090eb289b 100644 --- a/tables/nodes/filenode.py +++ b/tables/nodes/filenode.py @@ -255,7 +255,7 @@ def readinto(self, b): n = stop - start # XXX This ought to work with anything that supports the buffer API - b[:n] = self._node.read(start, stop).tostring() + b[:n] = self._node.read(start, stop).tobytes() self._pos += n diff --git a/tables/tests/test_tables.py b/tables/tests/test_tables.py index 12fc986ac..068e8d65c 100644 --- a/tables/tests/test_tables.py +++ b/tables/tests/test_tables.py @@ -2950,7 +2950,7 @@ def test01(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test01b(self): @@ -2982,7 +2982,7 @@ def test01b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test02(self): @@ -3015,7 +3015,7 @@ def test02(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test03(self): @@ -3050,7 +3050,7 @@ def test03(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test04(self): @@ -3085,7 +3085,7 @@ def test04(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test05(self): @@ -3117,7 +3117,7 @@ def test05(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06a(self): @@ -3149,7 +3149,7 @@ def test06a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06b(self): @@ -3187,7 +3187,7 @@ def test06b(self): # if common.verbose: # print "Original table-->", repr(r2) # print "Should look like-->", repr(r1) -# self.assertEqual(r1.tostring(), r2.tostring()) +# self.assertEqual(r1.tobytes(), r2.tobytes()) # self.assertEqual(table.nrows, 4) def test07(self): @@ -3218,7 +3218,7 @@ def test07(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08(self): @@ -3250,7 +3250,7 @@ def test08(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test09(self): @@ -3285,7 +3285,7 @@ def test09(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) @@ -3341,7 +3341,7 @@ def test01(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test02(self): @@ -3378,7 +3378,7 @@ def test02(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test03(self): @@ -3415,7 +3415,7 @@ def test03(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test04(self): @@ -3452,7 +3452,7 @@ def test04(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test05(self): @@ -3486,7 +3486,7 @@ def test05(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06(self): @@ -3520,7 +3520,7 @@ def test06(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test07(self): @@ -3554,7 +3554,7 @@ def test07(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08(self): @@ -3598,7 +3598,7 @@ def test08(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) def test08b(self): @@ -3642,7 +3642,7 @@ def test08b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) def test09(self): @@ -3691,7 +3691,7 @@ def test09(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) def test09b(self): @@ -3741,7 +3741,7 @@ def test09b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) @@ -3784,7 +3784,7 @@ def test00(self): if self.reopen: self._reopen() r2 = self.h5file.root.recarray.read() - self.assertEqual(r.tostring(), r2.tostring()) + self.assertEqual(r.tobytes(), r2.tobytes()) def test01(self): """Checking saving a recarray with an offset in its buffer""" @@ -3808,7 +3808,7 @@ def test01(self): self._reopen() r2 = self.h5file.root.recarray.read() - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) def test02(self): "Checking saving a large recarray with an offset in its buffer" @@ -3831,7 +3831,7 @@ def test02(self): self._reopen() r2 = self.h5file.root.recarray.read() - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) def test03(self): """Checking saving a strided recarray with an offset in its buffer""" @@ -3857,7 +3857,7 @@ def test03(self): self._reopen() r2 = self.h5file.root.recarray.read() - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) def test04(self): """Checking appending several rows at once""" @@ -3892,7 +3892,7 @@ class Rec(tables.IsDescription): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test05(self): @@ -3928,7 +3928,7 @@ def test05(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06a(self): @@ -3962,7 +3962,7 @@ def test06a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06b(self): @@ -3996,7 +3996,7 @@ def test06b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test07a(self): @@ -4029,7 +4029,7 @@ def test07a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test07b(self): @@ -4064,7 +4064,7 @@ def test07b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test07c(self): @@ -4119,7 +4119,7 @@ def test08a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08a2(self): @@ -4154,7 +4154,7 @@ def test08a2(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08b(self): @@ -4189,7 +4189,7 @@ def test08b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08b2(self): @@ -4225,7 +4225,7 @@ def test08b2(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08c(self): @@ -4262,7 +4262,7 @@ def test08c(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test09a(self): @@ -4298,7 +4298,7 @@ def test09a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test09b(self): @@ -4334,7 +4334,7 @@ def test09b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test09c(self): @@ -4370,7 +4370,7 @@ def test09c(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test09d(self): @@ -4407,7 +4407,7 @@ def test09d(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test10a(self): @@ -4449,7 +4449,7 @@ def test10a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test10b(self): @@ -4490,7 +4490,7 @@ def test10b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) @@ -5217,7 +5217,7 @@ def test00(self): # Read it again r2 = self.h5file.root.largerow.read() - self.assertEqual(r.tostring(), r2.tostring()) + self.assertEqual(r.tobytes(), r2.tobytes()) def test01(self): """Checking saving a Table with an extremely large rowsize""" @@ -5229,7 +5229,7 @@ def test01(self): # Read it again r2 = self.h5file.root.largerow.read() - self.assertEqual(r.tostring(), r2.tostring()) + self.assertEqual(r.tobytes(), r2.tobytes()) class DefaultValues(common.TempFileMixin, TestCase): @@ -5308,7 +5308,7 @@ def test00(self): # It is probably due to some difference in the value of bits used # for patting (longdoubles use just 80 bits but are stored in 96 or # 128 bits in numpy arrays) - # self.assertEqual(r.tostring(), r2.tostring()) + # self.assertEqual(r.tobytes(), r2.tobytes()) def test01(self): """Checking saving a Table with default values (using different Row)""" @@ -5382,7 +5382,7 @@ def test01(self): # It is probably due to some difference in the value of bits used # for patting (longdoubles use just 80 bits but are stored in 96 or # 128 bits in numpy arrays) - # self.assertEqual(r.tostring(), r2.tostring()) + # self.assertEqual(r.tobytes(), r2.tobytes()) class OldRecordDefaultValues(DefaultValues): diff --git a/tables/tests/test_tablesMD.py b/tables/tests/test_tablesMD.py index 3e100fa36..f0f9870fc 100644 --- a/tables/tests/test_tablesMD.py +++ b/tables/tests/test_tablesMD.py @@ -1026,7 +1026,7 @@ def test00(self): # Read it again r2 = self.h5file.root.recarray.read() - self.assertEqual(r.tostring(), r2.tostring()) + self.assertEqual(r.tobytes(), r2.tobytes()) def test01(self): """Checking saving a recarray with an offset in its buffer""" @@ -1052,7 +1052,7 @@ def test01(self): # Read it again r2 = self.h5file.root.recarray.read() - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) def test02(self): """Checking saving a slice of a large recarray""" @@ -1078,7 +1078,7 @@ def test02(self): # Read it again r2 = self.h5file.root.recarray.read() - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) def test03(self): """Checking saving a slice of an strided recarray""" @@ -1107,7 +1107,7 @@ def test03(self): # Read it again r2 = self.h5file.root.recarray.read() - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) def test08a(self): """Checking modifying one column (single column version, list)""" @@ -1141,7 +1141,7 @@ def test08a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08b(self): @@ -1178,7 +1178,7 @@ def test08b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08b2(self): @@ -1216,7 +1216,7 @@ def test08b2(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) @@ -1270,8 +1270,8 @@ def test00(self): print("Record values:") print(r) - # Both checks do work, however, tostring() seems more stringent. - self.assertEqual(r.tostring(), r2.tostring()) + # Both checks do work, however, tobytes() seems more stringent. + self.assertEqual(r.tobytes(), r2.tobytes()) # self.assertTrue(common.areArraysEqual(r,r2)) @@ -1404,7 +1404,7 @@ def test01(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test01b(self): @@ -1437,7 +1437,7 @@ def test01b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test02(self): @@ -1472,7 +1472,7 @@ def test02(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test03(self): @@ -1509,7 +1509,7 @@ def test03(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test04(self): @@ -1545,7 +1545,7 @@ def test04(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test05(self): @@ -1578,7 +1578,7 @@ def test05(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06a(self): @@ -1610,7 +1610,7 @@ def test06a(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06b(self): @@ -1662,7 +1662,7 @@ def test07(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08(self): @@ -1695,7 +1695,7 @@ def test08(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test09(self): @@ -1730,7 +1730,7 @@ def test09(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) @@ -1796,7 +1796,7 @@ def test01(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test02(self): @@ -1834,7 +1834,7 @@ def test02(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test03(self): @@ -1872,7 +1872,7 @@ def test03(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test04(self): @@ -1910,7 +1910,7 @@ def test04(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test05(self): @@ -1945,7 +1945,7 @@ def test05(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test06(self): @@ -1980,7 +1980,7 @@ def test06(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test07(self): @@ -2017,7 +2017,7 @@ def test07(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, 4) def test08(self): @@ -2062,7 +2062,7 @@ def test08(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) def test08b(self): @@ -2107,7 +2107,7 @@ def test08b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) def test09(self): @@ -2158,7 +2158,7 @@ def test09(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows) def test09b(self): @@ -2208,7 +2208,7 @@ def test09b(self): if common.verbose: print("Original table-->", repr(r2)) print("Should look like-->", repr(r1)) - self.assertEqual(r1.tostring(), r2.tostring()) + self.assertEqual(r1.tobytes(), r2.tobytes()) self.assertEqual(table.nrows, nrows)