Changeset 391 for python/trunk/Lib/test/test_userdict.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_userdict.py (modified) (7 diffs)

python/trunk/Lib/test/test_userdict.py

@@ -39 +39 @@
         self.assertEqual(UserDict.UserDict.fromkeys('one two'.split(), 1), d5)
         self.assertEqual(UserDict.UserDict().fromkeys('one two'.split(), 1), d5)
-        self.assert_(u1.fromkeys('one two'.split()) is not u1)
-        self.assert_(isinstance(u1.fromkeys('one two'.split()), UserDict.UserDict))
-        self.assert_(isinstance(u2.fromkeys('one two'.split()), UserDict.IterableUserDict))
+        self.assertTrue(u1.fromkeys('one two'.split()) is not u1)
+        self.assertIsInstance(u1.fromkeys('one two'.split()), UserDict.UserDict)
+        self.assertIsInstance(u2.fromkeys('one two'.split()), UserDict.IterableUserDict)
 
         # Test __repr__
         self.assertEqual(str(u0), str(d0))
         self.assertEqual(repr(u1), repr(d1))
-        self.assertEqual(`u2`, `d2`)
+        self.assertEqual(repr(u2), repr(d2))
 
         # Test __cmp__ and __len__
@@ -96 +96 @@
         # Test has_key and "in".
         for i in u2.keys():
-            self.assert_(u2.has_key(i))
-            self.assert_(i in u2)
-            self.assertEqual(u1.has_key(i), d1.has_key(i))
+            self.assertIn(i, u2)
             self.assertEqual(i in u1, i in d1)
-            self.assertEqual(u0.has_key(i), d0.has_key(i))
             self.assertEqual(i in u0, i in d0)
+            with test_support.check_py3k_warnings():
+                self.assertTrue(u2.has_key(i))
+                self.assertEqual(u1.has_key(i), d1.has_key(i))
+                self.assertEqual(u0.has_key(i), d0.has_key(i))
 
         # Test update
@@ -132 +133 @@
         t = UserDict.UserDict()
         self.assertEqual(t.setdefault("x", 42), 42)
-        self.assert_(t.has_key("x"))
+        self.assertTrue(t.has_key("x"))
         self.assertEqual(t.setdefault("x", 23), 42)
 
@@ -162 +163 @@
         self.assertEqual(d[1], 2)
         self.assertEqual(d[3], 4)
-        self.assert_(2 not in d)
-        self.assert_(2 not in d.keys())
+        self.assertNotIn(2, d)
+        self.assertNotIn(2, d.keys())
         self.assertEqual(d[2], 42)
         class E(UserDict.UserDict):
@@ -270 +271 @@
         ## Now, test the DictMixin methods one by one
         # has_key
-        self.assert_(s.has_key(10))
-        self.assert_(not s.has_key(20))
+        self.assertTrue(s.has_key(10))
+        self.assertTrue(not s.has_key(20))
 
         # __contains__
-        self.assert_(10 in s)
-        self.assert_(20 not in s)
+        self.assertIn(10, s)
+        self.assertNotIn(20, s)
 
         # __iter__
@@ -310 +311 @@
         # pop
         self.assertEqual(s.pop(10), 'ten')
-        self.assert_(10 not in s)
+        self.assertNotIn(10, s)
         s[10] = 'ten'
         self.assertEqual(s.pop("x", 1), 1)
@@ -318 +319 @@
         # popitem
         k, v = s.popitem()
-        self.assert_(k not in s)
+        self.assertNotIn(k, s)
         s[k] = v