Merged revisions 73715 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........

1 files changed, 24 insertions, 24 deletions

diff --git a/Lib/ctypes/test/test_memfunctions.py b/Lib/ctypes/test/test_memfunctions.py
index 4bee77f..7082b55 100644
--- a/Lib/ctypes/test/test_memfunctions.py
+++ b/Lib/ctypes/test/test_memfunctions.py
@@ -19,45 +19,45 @@ class MemFunctionsTest(unittest.TestCase):
         a = create_string_buffer(1000000)
         p = b"Hello, World"
         result = memmove(a, p, len(p))
-        self.failUnlessEqual(a.value, b"Hello, World")
+        self.assertEqual(a.value, b"Hello, World")
 
-        self.failUnlessEqual(string_at(result), b"Hello, World")
-        self.failUnlessEqual(string_at(result, 5), b"Hello")
-        self.failUnlessEqual(string_at(result, 16), b"Hello, World\0\0\0\0")
-        self.failUnlessEqual(string_at(result, 0), b"")
+        self.assertEqual(string_at(result), b"Hello, World")
+        self.assertEqual(string_at(result, 5), b"Hello")
+        self.assertEqual(string_at(result, 16), b"Hello, World\0\0\0\0")
+        self.assertEqual(string_at(result, 0), b"")
 
     def test_memset(self):
         a = create_string_buffer(1000000)
         result = memset(a, ord('x'), 16)
-        self.failUnlessEqual(a.value, b"xxxxxxxxxxxxxxxx")
+        self.assertEqual(a.value, b"xxxxxxxxxxxxxxxx")
 
-        self.failUnlessEqual(string_at(result), b"xxxxxxxxxxxxxxxx")
-        self.failUnlessEqual(string_at(a), b"xxxxxxxxxxxxxxxx")
-        self.failUnlessEqual(string_at(a, 20), b"xxxxxxxxxxxxxxxx\0\0\0\0")
+        self.assertEqual(string_at(result), b"xxxxxxxxxxxxxxxx")
+        self.assertEqual(string_at(a), b"xxxxxxxxxxxxxxxx")
+        self.assertEqual(string_at(a, 20), b"xxxxxxxxxxxxxxxx\0\0\0\0")
 
     def test_cast(self):
         a = (c_ubyte * 32)(*map(ord, "abcdef"))
-        self.failUnlessEqual(cast(a, c_char_p).value, "abcdef")
-        self.failUnlessEqual(cast(a, POINTER(c_byte))[:7],
+        self.assertEqual(cast(a, c_char_p).value, "abcdef")
+        self.assertEqual(cast(a, POINTER(c_byte))[:7],
                              [97, 98, 99, 100, 101, 102, 0])
-        self.failUnlessEqual(cast(a, POINTER(c_byte))[:7:],
+        self.assertEqual(cast(a, POINTER(c_byte))[:7:],
                              [97, 98, 99, 100, 101, 102, 0])
-        self.failUnlessEqual(cast(a, POINTER(c_byte))[6:-1:-1],
+        self.assertEqual(cast(a, POINTER(c_byte))[6:-1:-1],
                              [0, 102, 101, 100, 99, 98, 97])
-        self.failUnlessEqual(cast(a, POINTER(c_byte))[:7:2],
+        self.assertEqual(cast(a, POINTER(c_byte))[:7:2],
                              [97, 99, 101, 0])
-        self.failUnlessEqual(cast(a, POINTER(c_byte))[:7:7],
+        self.assertEqual(cast(a, POINTER(c_byte))[:7:7],
                              [97])
 
     def test_string_at(self):
         s = string_at(b"foo bar")
         # XXX The following may be wrong, depending on how Python
         # manages string instances
-        self.failUnlessEqual(2, sys.getrefcount(s))
-        self.failUnless(s, "foo bar")
+        self.assertEqual(2, sys.getrefcount(s))
+        self.assertTrue(s, "foo bar")
 
-        self.failUnlessEqual(string_at(b"foo bar", 7), b"foo bar")
-        self.failUnlessEqual(string_at(b"foo bar", 3), b"foo")
+        self.assertEqual(string_at(b"foo bar", 7), b"foo bar")
+        self.assertEqual(string_at(b"foo bar", 3), b"foo")
 
     try:
         create_unicode_buffer
@@ -68,12 +68,12 @@ class MemFunctionsTest(unittest.TestCase):
             p = create_unicode_buffer("Hello, World")
             a = create_unicode_buffer(1000000)
             result = memmove(a, p, len(p) * sizeof(c_wchar))
-            self.failUnlessEqual(a.value, "Hello, World")
+            self.assertEqual(a.value, "Hello, World")
 
-            self.failUnlessEqual(wstring_at(a), "Hello, World")
-            self.failUnlessEqual(wstring_at(a, 5), "Hello")
-            self.failUnlessEqual(wstring_at(a, 16), "Hello, World\0\0\0\0")
-            self.failUnlessEqual(wstring_at(a, 0), "")
+            self.assertEqual(wstring_at(a), "Hello, World")
+            self.assertEqual(wstring_at(a, 5), "Hello")
+            self.assertEqual(wstring_at(a, 16), "Hello, World\0\0\0\0")
+            self.assertEqual(wstring_at(a, 0), "")
 
 if __name__ == "__main__":
     unittest.main()