Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 86596 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
This commit is contained in:
Ezio Melotti 2010-11-21 01:30:29 +00:00
parent b65b4937e2
commit 19f2aeba67
164 changed files with 2281 additions and 2279 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/ctypes/test/test_keeprefs.py
View file

@ -4,19 +4,19 @@
class SimpleTestCase(unittest.TestCase):
def test_cint(self):
x = c_int()
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
x.value = 42
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
x = c_int(99)
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
def test_ccharp(self):
x = c_char_p()
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
x.value = "abc"
self.assertEquals(x._objects, b"abc")
self.assertEqual(x._objects, b"abc")
x = c_char_p("spam")
self.assertEquals(x._objects, b"spam")
self.assertEqual(x._objects, b"spam")
class StructureTestCase(unittest.TestCase):
def test_cint_struct(self):
@ -25,21 +25,21 @@ class X(Structure):
("b", c_int)]
x = X()
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
x.a = 42
x.b = 99
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
def test_ccharp_struct(self):
class X(Structure):
_fields_ = [("a", c_char_p),
("b", c_char_p)]
x = X()
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
x.a = "spam"
x.b = "foo"
self.assertEquals(x._objects, {"0": b"spam", "1": b"foo"})
self.assertEqual(x._objects, {"0": b"spam", "1": b"foo"})
def test_struct_struct(self):
class POINT(Structure):
@ -52,28 +52,28 @@ class RECT(Structure):
r.ul.y = 1
r.lr.x = 2
r.lr.y = 3
self.assertEquals(r._objects, None)
self.assertEqual(r._objects, None)
r = RECT()
pt = POINT(1, 2)
r.ul = pt
self.assertEquals(r._objects, {'0': {}})
self.assertEqual(r._objects, {'0': {}})
r.ul.x = 22
r.ul.y = 44
self.assertEquals(r._objects, {'0': {}})
self.assertEqual(r._objects, {'0': {}})
r.lr = POINT()
self.assertEquals(r._objects, {'0': {}, '1': {}})
self.assertEqual(r._objects, {'0': {}, '1': {}})
class ArrayTestCase(unittest.TestCase):
def test_cint_array(self):
INTARR = c_int * 3
ia = INTARR()
self.assertEquals(ia._objects, None)
self.assertEqual(ia._objects, None)
ia[0] = 1
ia[1] = 2
ia[2] = 3
self.assertEquals(ia._objects, None)
self.assertEqual(ia._objects, None)
class X(Structure):
_fields_ = [("x", c_int),
@ -83,9 +83,9 @@ class X(Structure):
x.x = 1000
x.a[0] = 42
x.a[1] = 96
self.assertEquals(x._objects, None)
self.assertEqual(x._objects, None)
x.a = ia
self.assertEquals(x._objects, {'1': {}})
self.assertEqual(x._objects, {'1': {}})
class PointerTestCase(unittest.TestCase):
def test_p_cint(self):