summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeador Inge <meadori@gmail.com>2012-07-20 17:48:34 (GMT)
committerMeador Inge <meadori@gmail.com>2012-07-20 17:48:34 (GMT)
commitca9652ea5d1d9ebddd1acf6abbbf3751bc366a44 (patch)
treec802fddf400eb23eb4b8362bbb9fd76966ea07d6
parentddcb6206bf7feebb0a1671e475ee877f683af145 (diff)
downloadcpython-ca9652ea5d1d9ebddd1acf6abbbf3751bc366a44.zip
cpython-ca9652ea5d1d9ebddd1acf6abbbf3751bc366a44.tar.gz
cpython-ca9652ea5d1d9ebddd1acf6abbbf3751bc366a44.tar.bz2
Issue #15406: Fix deprecation warning in ctypes test_bitfields.py
Patch by Flávio Ribeiro.
-rw-r--r--Lib/ctypes/test/test_bitfields.py8
-rw-r--r--Misc/ACKS1
2 files changed, 5 insertions, 4 deletions
diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py
index 28c8795..c89ee34 100644
--- a/Lib/ctypes/test/test_bitfields.py
+++ b/Lib/ctypes/test/test_bitfields.py
@@ -246,9 +246,9 @@ class BitFieldTest(unittest.TestCase):
_fields_ = [("a", c_uint32, 32)]
x = X()
x.a = 10
- self.assertEquals(x.a, 10)
+ self.assertEqual(x.a, 10)
x.a = 0xFDCBA987
- self.assertEquals(x.a, 0xFDCBA987)
+ self.assertEqual(x.a, 0xFDCBA987)
@unittest.skipUnless(hasattr(ctypes, "c_uint64"), "c_int64 is required")
def test_uint64(self):
@@ -256,9 +256,9 @@ class BitFieldTest(unittest.TestCase):
_fields_ = [("a", c_uint64, 64)]
x = X()
x.a = 10
- self.assertEquals(x.a, 10)
+ self.assertEqual(x.a, 10)
x.a = 0xFEDCBA9876543211
- self.assertEquals(x.a, 0xFEDCBA9876543211)
+ self.assertEqual(x.a, 0xFEDCBA9876543211)
if __name__ == "__main__":
unittest.main()
diff --git a/Misc/ACKS b/Misc/ACKS
index 16847be..95c06ba 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -778,6 +778,7 @@ Michael P. Reilly
Bernhard Reiter
Steven Reiz
Roeland Rengelink
+Flávio Ribeiro
Tim Rice
Francesco Ricciardi
Jan Pieter Riegel