Intermediate changes

1 files changed, 65 insertions, 65 deletions

diff --git a/util/memory/blob_ut.pyx b/util/memory/blob_ut.pyx
index 2332e6fa20..35a72996de 100644
--- a/util/memory/blob_ut.pyx
+++ b/util/memory/blob_ut.pyx
@@ -12,21 +12,21 @@ class TestBlob(unittest.TestCase):
     def test_ctor(self):
         cdef TBlob tmp = TBlob()
         cdef TBlob tmp2 = TBlob(tmp)
-        self.assertEquals(tmp.Size(), 0)
-        self.assertEquals(tmp2.Size(), 0)
+        self.assertEqual(tmp.Size(), 0)
+        self.assertEqual(tmp2.Size(), 0)
 
     def test_empty_data(self):
         cdef TBlob tmp = TBlob()
-        self.assertEquals(tmp.Data() == NULL, True)
-        self.assertEquals(tmp.AsCharPtr() == NULL, True)
-        self.assertEquals(tmp.AsUnsignedCharPtr() == NULL, True)
-        self.assertEquals(tmp.Empty(), True)
-        self.assertEquals(tmp.IsNull(), True)
+        self.assertEqual(tmp.Data() == NULL, True)
+        self.assertEqual(tmp.AsCharPtr() == NULL, True)
+        self.assertEqual(tmp.AsUnsignedCharPtr() == NULL, True)
+        self.assertEqual(tmp.Empty(), True)
+        self.assertEqual(tmp.IsNull(), True)
 
     def test_empty_is_null(self):
         cdef TBlob tmp = TBlob.NoCopy("", 0)
-        self.assertEquals(tmp.Empty(), True)
-        self.assertEquals(tmp.IsNull(), False)
+        self.assertEqual(tmp.Empty(), True)
+        self.assertEqual(tmp.IsNull(), False)
 
     def test_data_types(self):
         cdef const char* char_data = TBlob().AsCharPtr()
@@ -36,98 +36,98 @@ class TestBlob(unittest.TestCase):
     def test_no_copy(self):
         cdef const char* txt = "hello world"
         cdef TBlob tmp = TBlob.NoCopy(txt, len(txt))
-        self.assertEquals(tmp.AsCharPtr() - txt, 0)
-        self.assertEquals(tmp.Size(), 11)
-        self.assertEquals(tmp.AsCharPtr()[:tmp.Size()], "hello world")
-        self.assertEquals(tmp.Empty(), False)
-        self.assertEquals(tmp.IsNull(), False)
+        self.assertEqual(tmp.AsCharPtr() - txt, 0)
+        self.assertEqual(tmp.Size(), 11)
+        self.assertEqual(tmp.AsCharPtr()[:tmp.Size()], "hello world")
+        self.assertEqual(tmp.Empty(), False)
+        self.assertEqual(tmp.IsNull(), False)
 
     def test_copy(self):
         cdef const char* txt = "hello world"
         cdef TBlob tmp = TBlob.Copy(txt, len(txt))
         self.assertNotEquals(tmp.AsCharPtr() - txt, 0)
-        self.assertEquals(tmp.Size(), 11)
-        self.assertEquals(tmp.AsCharPtr()[:tmp.Size()], "hello world")
-        self.assertEquals(tmp.Empty(), False)
-        self.assertEquals(tmp.IsNull(), False)
+        self.assertEqual(tmp.Size(), 11)
+        self.assertEqual(tmp.AsCharPtr()[:tmp.Size()], "hello world")
+        self.assertEqual(tmp.Empty(), False)
+        self.assertEqual(tmp.IsNull(), False)
 
     def test_from_string(self):
         cdef TBlob tmp = TBlob.FromString(TString("hello world"))
-        self.assertEquals(tmp.Size(), 11)
-        self.assertEquals(tmp.AsCharPtr()[:tmp.Size()], "hello world")
-        self.assertEquals(tmp.Empty(), False)
-        self.assertEquals(tmp.IsNull(), False)
+        self.assertEqual(tmp.Size(), 11)
+        self.assertEqual(tmp.AsCharPtr()[:tmp.Size()], "hello world")
+        self.assertEqual(tmp.Empty(), False)
+        self.assertEqual(tmp.IsNull(), False)
 
     def test_from_file(self):
         with open("file", "w") as f:
             f.write("hello world")
         cdef TBlob tmp = TBlob.FromFile("file")
-        self.assertEquals(tmp.Size(), 11)
-        self.assertEquals(tmp.AsCharPtr()[:tmp.Size()], "hello world")
-        self.assertEquals(tmp.Empty(), False)
-        self.assertEquals(tmp.IsNull(), False)
+        self.assertEqual(tmp.Size(), 11)
+        self.assertEqual(tmp.AsCharPtr()[:tmp.Size()], "hello world")
+        self.assertEqual(tmp.Empty(), False)
+        self.assertEqual(tmp.IsNull(), False)
 
     def test_precharged_from_file(self):
         with open("precharged", "w") as f:
             f.write("hello world")
         cdef TBlob tmp = TBlob.PrechargedFromFile("precharged")
-        self.assertEquals(tmp.Size(), 11)
-        self.assertEquals(tmp.AsCharPtr()[:tmp.Size()], "hello world")
-        self.assertEquals(tmp.Empty(), False)
-        self.assertEquals(tmp.IsNull(), False)
+        self.assertEqual(tmp.Size(), 11)
+        self.assertEqual(tmp.AsCharPtr()[:tmp.Size()], "hello world")
+        self.assertEqual(tmp.Empty(), False)
+        self.assertEqual(tmp.IsNull(), False)
 
     def test_swap_drop(self):
         cdef TBlob tmp = TBlob.NoCopy("hello world", 11)
         cdef TBlob tmp2
         tmp2.Swap(tmp)
-        self.assertEquals(tmp2.Size(), 11)
-        self.assertEquals(tmp.Size(), 0)
-        self.assertEquals(tmp2.AsCharPtr()[:tmp2.Size()], "hello world")
+        self.assertEqual(tmp2.Size(), 11)
+        self.assertEqual(tmp.Size(), 0)
+        self.assertEqual(tmp2.AsCharPtr()[:tmp2.Size()], "hello world")
         tmp2.Swap(tmp)
-        self.assertEquals(tmp2.Size(), 0)
-        self.assertEquals(tmp.Size(), 11)
+        self.assertEqual(tmp2.Size(), 0)
+        self.assertEqual(tmp.Size(), 11)
         tmp.Drop()
-        self.assertEquals(tmp.Size(), 0)
+        self.assertEqual(tmp.Size(), 0)
         
     def test_operator_brackets(self):
         cdef TBlob tmp = TBlob.NoCopy("hello world", 11)
-        self.assertEquals(tmp[0], ord('h'))
-        self.assertEquals(tmp[1], ord('e'))
-        self.assertEquals(tmp[2], ord('l'))
-        self.assertEquals(tmp[3], ord('l'))
-        self.assertEquals(tmp[4], ord('o'))
-        self.assertEquals(tmp[5], ord(' '))
-        self.assertEquals(tmp[6], ord('w'))
-        self.assertEquals(tmp[7], ord('o'))
-        self.assertEquals(tmp[8], ord('r'))
-        self.assertEquals(tmp[9], ord('l'))
-        self.assertEquals(tmp[10], ord('d'))
+        self.assertEqual(tmp[0], ord('h'))
+        self.assertEqual(tmp[1], ord('e'))
+        self.assertEqual(tmp[2], ord('l'))
+        self.assertEqual(tmp[3], ord('l'))
+        self.assertEqual(tmp[4], ord('o'))
+        self.assertEqual(tmp[5], ord(' '))
+        self.assertEqual(tmp[6], ord('w'))
+        self.assertEqual(tmp[7], ord('o'))
+        self.assertEqual(tmp[8], ord('r'))
+        self.assertEqual(tmp[9], ord('l'))
+        self.assertEqual(tmp[10], ord('d'))
 
     def test_operator_equal(self):
         cdef TBlob foo = TBlob.NoCopy("foo", 3)
         cdef TBlob bar = TBlob.NoCopy("bar", 3)
-        self.assertEquals(foo.AsCharPtr(), "foo")
-        self.assertEquals(bar.AsCharPtr(), "bar")
+        self.assertEqual(foo.AsCharPtr(), "foo")
+        self.assertEqual(bar.AsCharPtr(), "bar")
         bar = foo
-        self.assertEquals(foo.AsCharPtr(), "foo")
-        self.assertEquals(bar.AsCharPtr(), "foo")
+        self.assertEqual(foo.AsCharPtr(), "foo")
+        self.assertEqual(bar.AsCharPtr(), "foo")
 
     def test_sub_blob(self):
         cdef TBlob tmp = TBlob.NoCopy("hello world", 11)
-        self.assertEquals(tmp.SubBlob(0).Size(), 0)
-        self.assertEquals(tmp.SubBlob(1).Size(), 1)
-        self.assertEquals(tmp.SubBlob(5).Size(), 5)
-        self.assertEquals(tmp.AsCharPtr() - tmp.SubBlob(0).AsCharPtr(), 0)
+        self.assertEqual(tmp.SubBlob(0).Size(), 0)
+        self.assertEqual(tmp.SubBlob(1).Size(), 1)
+        self.assertEqual(tmp.SubBlob(5).Size(), 5)
+        self.assertEqual(tmp.AsCharPtr() - tmp.SubBlob(0).AsCharPtr(), 0)
 
-        self.assertEquals(tmp.SubBlob(0, 0).Size(), 0)
-        self.assertEquals(tmp.SubBlob(0, 1).Size(), 1)
-        self.assertEquals(tmp.SubBlob(0, 5).Size(), 5)
-        self.assertEquals(tmp.AsCharPtr() - tmp.SubBlob(0, 0).AsCharPtr(), 0)
+        self.assertEqual(tmp.SubBlob(0, 0).Size(), 0)
+        self.assertEqual(tmp.SubBlob(0, 1).Size(), 1)
+        self.assertEqual(tmp.SubBlob(0, 5).Size(), 5)
+        self.assertEqual(tmp.AsCharPtr() - tmp.SubBlob(0, 0).AsCharPtr(), 0)
 
-        self.assertEquals(tmp.SubBlob(1, 1).Size(), 0)
-        self.assertEquals(tmp.SubBlob(1, 2).Size(), 1)
-        self.assertEquals(tmp.SubBlob(1, 6).Size(), 5)
-        self.assertEquals(tmp.SubBlob(1, 1).AsCharPtr() - tmp.AsCharPtr(), 1)
+        self.assertEqual(tmp.SubBlob(1, 1).Size(), 0)
+        self.assertEqual(tmp.SubBlob(1, 2).Size(), 1)
+        self.assertEqual(tmp.SubBlob(1, 6).Size(), 5)
+        self.assertEqual(tmp.SubBlob(1, 1).AsCharPtr() - tmp.AsCharPtr(), 1)
 
         with self.assertRaises(Exception):
             tmp.SubBlob(2, 1)
@@ -135,7 +135,7 @@ class TestBlob(unittest.TestCase):
     def test_deep_copy(self):
         cdef TBlob tmp = TBlob.NoCopy("hello world", 11)
         cdef TBlob tmp2 = tmp.DeepCopy()
-        self.assertEquals(tmp.AsCharPtr()[:tmp.Size()], "hello world")
-        self.assertEquals(tmp2.AsCharPtr()[:tmp2.Size()], "hello world")
+        self.assertEqual(tmp.AsCharPtr()[:tmp.Size()], "hello world")
+        self.assertEqual(tmp2.AsCharPtr()[:tmp2.Size()], "hello world")
         self.assertNotEquals(tmp2.AsCharPtr() - tmp.AsCharPtr(), 0)