Changeset 391 for python/trunk/Lib/test/test_slice.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_slice.py (modified) (2 diffs)

python/trunk/Lib/test/test_slice.py

@@ -72 +72 @@
         obj = AnyClass()
         s = slice(obj)
-        self.assert_(s.stop is obj)
+        self.assertTrue(s.stop is obj)
 
     def test_indices(self):
@@ -116 +116 @@
 
         x = X()
-        x[1:2] = 42
-        self.assertEquals(tmp, [(1, 2, 42)])
+        with test_support.check_py3k_warnings():
+            x[1:2] = 42
+        self.assertEqual(tmp, [(1, 2, 42)])
 
     def test_pickle(self):