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

python/trunk/Lib/test/test_string.py

@@ -177 +177 @@
         class CheckAllUsedFormatter(string.Formatter):
             def check_unused_args(self, used_args, args, kwargs):
-                # Track which arguments actuallly got used
+                # Track which arguments actually got used
                 unused_args = set(kwargs.keys())
                 unused_args.update(range(0, len(args)))
@@ -203 +203 @@
 
     def test_builtin(self):
-        self.assert_(str is bytes)
+        self.assertTrue(str is bytes)
 
     def test_syntax(self):
         self.assertEqual(b"spam", "spam")
         self.assertEqual(br"egg\foo", "egg\\foo")
-        self.assert_(type(b""), str)
-        self.assert_(type(br""), str)
+        self.assertTrue(type(b""), str)
+        self.assertTrue(type(br""), str)
 
 def test_main():