Changeset 391 for python/trunk/Lib/test/test_contains.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_contains.py (modified) (5 diffs)

python/trunk/Lib/test/test_contains.py

@@ -21 +21 @@
         b = set(1)
         c = seq(1)
-        self.assert_(1 in b)
-        self.assert_(0 not in b)
-        self.assert_(1 in c)
-        self.assert_(0 not in c)
+        self.assertIn(1, b)
+        self.assertNotIn(0, b)
+        self.assertIn(1, c)
+        self.assertNotIn(0, c)
         self.assertRaises(TypeError, lambda: 1 in a)
         self.assertRaises(TypeError, lambda: 1 not in a)
 
         # test char in string
-        self.assert_('c' in 'abc')
-        self.assert_('d' not in 'abc')
+        self.assertIn('c', 'abc')
+        self.assertNotIn('d', 'abc')
 
-        self.assert_('' in '')
-        self.assert_('' in 'abc')
+        self.assertIn('', '')
+        self.assertIn('', 'abc')
 
         self.assertRaises(TypeError, lambda: None in 'abc')
@@ -39 +39 @@
     if have_unicode:
         def test_char_in_unicode(self):
-            self.assert_('c' in unicode('abc'))
-            self.assert_('d' not in unicode('abc'))
+            self.assertIn('c', unicode('abc'))
+            self.assertNotIn('d', unicode('abc'))
 
-            self.assert_('' in unicode(''))
-            self.assert_(unicode('') in '')
-            self.assert_(unicode('') in unicode(''))
-            self.assert_('' in unicode('abc'))
-            self.assert_(unicode('') in 'abc')
-            self.assert_(unicode('') in unicode('abc'))
+            self.assertIn('', unicode(''))
+            self.assertIn(unicode(''), '')
+            self.assertIn(unicode(''), unicode(''))
+            self.assertIn('', unicode('abc'))
+            self.assertIn(unicode(''), 'abc')
+            self.assertIn(unicode(''), unicode('abc'))
 
             self.assertRaises(TypeError, lambda: None in unicode('abc'))
 
             # test Unicode char in Unicode
-            self.assert_(unicode('c') in unicode('abc'))
-            self.assert_(unicode('d') not in unicode('abc'))
+            self.assertIn(unicode('c'), unicode('abc'))
+            self.assertNotIn(unicode('d'), unicode('abc'))
 
             # test Unicode char in string
-            self.assert_(unicode('c') in 'abc')
-            self.assert_(unicode('d') not in 'abc')
+            self.assertIn(unicode('c'), 'abc')
+            self.assertNotIn(unicode('d'), 'abc')
 
     def test_builtin_sequence_types(self):
@@ -63 +63 @@
         a = range(10)
         for i in a:
-            self.assert_(i in a)
-        self.assert_(16 not in a)
-        self.assert_(a not in a)
+            self.assertIn(i, a)
+        self.assertNotIn(16, a)
+        self.assertNotIn(a, a)
 
         a = tuple(a)
         for i in a:
-            self.assert_(i in a)
-        self.assert_(16 not in a)
-        self.assert_(a not in a)
+            self.assertIn(i, a)
+        self.assertNotIn(16, a)
+        self.assertNotIn(a, a)
 
         class Deviant1:
@@ -87 +87 @@
                 return 1
 
-        self.assert_(Deviant1() not in Deviant1.aList)
+        self.assertNotIn(Deviant1(), Deviant1.aList)
 
         class Deviant2:
@@ -100 +100 @@
 
         try:
-            self.assert_(Deviant2() not in a)
+            self.assertNotIn(Deviant2(), a)
         except TypeError:
             pass