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

python/trunk/Lib/test/test_print.py

@@ -9 +9 @@
 from test import test_support
 
-import sys
 from StringIO import StringIO
 
@@ -17 +16 @@
 #  sep, end, and file
 # I use this machinery so that I'm not just passing default
-#  values to print, I'm eiher passing or not passing in the
+#  values to print, I'm either passing or not passing in the
 #  arguments
 dispatch = {
@@ -129 +128 @@
         buf = Recorder(False)
         print('hi', 'bye', end=u'\n', file=buf)
-        self.assertTrue(isinstance(buf.buf[1], unicode))
-        self.assertTrue(isinstance(buf.buf[3], unicode))
+        self.assertIsInstance(buf.buf[1], unicode)
+        self.assertIsInstance(buf.buf[3], unicode)
         del buf.buf[:]
         print(sep=u'x', file=buf)
-        self.assertTrue(isinstance(buf.buf[-1], unicode))
+        self.assertIsInstance(buf.buf[-1], unicode)