[Python-checkins] cpython (merge 3.2 -> default): Issue #15406: Fix deprecation warning in ctypes test_bitfields.py

[meador.inge]

http://hg.python.org/cpython/rev/f93efd4c45bd
changeset:   78197:f93efd4c45bd
parent:      78195:4431dc4bb770
parent:      78196:fb181698775d
user:        Meador Inge <meadori at gmail.com>
date:        Fri Jul 20 12:52:42 2012 -0500
summary:
  Issue #15406: Fix deprecation warning in ctypes test_bitfields.py

Patch by Flávio Ribeiro.

files:
  Lib/ctypes/test/test_bitfields.py |  8 ++++----
  Misc/ACKS                         |  1 +
  2 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py
--- a/Lib/ctypes/test/test_bitfields.py
+++ b/Lib/ctypes/test/test_bitfields.py
@@ -246,9 +246,9 @@
             _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 @@
             _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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -866,6 +866,7 @@
 Steven Reiz
 Roeland Rengelink
 Antoine Reversat
+Flávio Ribeiro
 Francesco Ricciardi
 Tim Rice
 Jan Pieter Riegel

-- 
Repository URL: http://hg.python.org/cpython