Changeset 391 for python/trunk/Lib/test/test_userstring.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_userstring.py (modified) (3 diffs)

python/trunk/Lib/test/test_userstring.py

@@ -105 +105 @@
                     L[start:stop:step] = data
                     s[start:stop:step] = "".join(data)
-                    self.assertEquals(s, "".join(L))
+                    self.assertEqual(s, "".join(L))
 
                     del L[start:stop:step]
                     del s[start:stop:step]
-                    self.assertEquals(s, "".join(L))
+                    self.assertEqual(s, "".join(L))
 
     def test_immutable(self):
@@ -115 +115 @@
         s2 = s.immutable()
         self.assertEqual(s, s2)
-        self.assert_(isinstance(s2, UserString))
+        self.assertIsInstance(s2, UserString)
 
     def test_iadd(self):
@@ -137 +137 @@
 def test_main():
     with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", ".*MutableString",
+        warnings.filterwarnings("ignore", ".*MutableString has been removed",
+                                DeprecationWarning)
+        warnings.filterwarnings("ignore",
+                                ".*__(get|set|del)slice__ has been removed",
                                 DeprecationWarning)
         test_support.run_unittest(UserStringTest, MutableStringTest)