| 
									
										
										
										
											2008-03-18 23:45:49 +00:00
										 |  |  | """Test correct operation of the print function.
 | 
					
						
							|  |  |  | """
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-20 23:56:08 +00:00
										 |  |  | # In 2.6, this gives us the behavior we want.  In 3.0, it has | 
					
						
							|  |  |  | #  no function, but it still must parse correctly. | 
					
						
							| 
									
										
										
										
											2008-03-18 23:45:49 +00:00
										 |  |  | from __future__ import print_function | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | import unittest | 
					
						
							|  |  |  | from test import test_support | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | import sys | 
					
						
							| 
									
										
											  
											
												Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
  r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
  Copied files from py3k w/o modifications
........
  r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
  Take One
  * Added initialization code, warnings, flags etc. to the appropriate places
  * Added new buffer interface to string type
  * Modified tests
  * Modified Makefile.pre.in to compile the new files
  * Added bytesobject.c to Python.h
........
  r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
  Disabled bytearray.extend for now since it causes an infinite recursion
  Fixed serveral unit tests
........
  r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
  Added PyBytes support to several places:
  str + bytearray
  ord(bytearray)
  bytearray(str, encoding)
........
  r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
  Fixed more unit tests related to type('') is not unicode
........
  r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
  Fixed more unit tests
  Fixed bytearray.extend
........
  r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
  Implemented old buffer interface for bytearray
........
  r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
  Added backport of the io module
........
  r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
  Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
  r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
  Fixed more tests
  Fixed bytearray() comparsion with unicode()
  Fixed iterator assignment of bytearray
........
  r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
  str(bytesarray()) now returns the bytes and not the representation of the bytearray object
  Enabled and fixed more unit tests
........
  r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
  Clear error PyNumber_AsSsize_t() fails
  Use CHARMASK for ob_svall access
  disabled a test with memoryview again
........
  r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
  Untested updates to the PCBuild directory
........
  r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
  The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
  r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
  Disabled last failing test
  I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
  r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
  Re-enabled bytes warning code
........
  r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
  Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
  r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
  Re-enabled bytearray subclassing - all tests are passing.
........
											
										 
											2008-03-26 12:49:49 +00:00
										 |  |  | if sys.version_info[0] == 3: | 
					
						
							| 
									
										
										
										
											2008-03-18 23:45:49 +00:00
										 |  |  |     # 3.x | 
					
						
							|  |  |  |     from io import StringIO | 
					
						
							| 
									
										
											  
											
												Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
  r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
  Copied files from py3k w/o modifications
........
  r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
  Take One
  * Added initialization code, warnings, flags etc. to the appropriate places
  * Added new buffer interface to string type
  * Modified tests
  * Modified Makefile.pre.in to compile the new files
  * Added bytesobject.c to Python.h
........
  r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
  Disabled bytearray.extend for now since it causes an infinite recursion
  Fixed serveral unit tests
........
  r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
  Added PyBytes support to several places:
  str + bytearray
  ord(bytearray)
  bytearray(str, encoding)
........
  r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
  Fixed more unit tests related to type('') is not unicode
........
  r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
  Fixed more unit tests
  Fixed bytearray.extend
........
  r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
  Implemented old buffer interface for bytearray
........
  r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
  Added backport of the io module
........
  r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
  Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
  r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
  Fixed more tests
  Fixed bytearray() comparsion with unicode()
  Fixed iterator assignment of bytearray
........
  r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
  str(bytesarray()) now returns the bytes and not the representation of the bytearray object
  Enabled and fixed more unit tests
........
  r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
  Clear error PyNumber_AsSsize_t() fails
  Use CHARMASK for ob_svall access
  disabled a test with memoryview again
........
  r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
  Untested updates to the PCBuild directory
........
  r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
  The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
  r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
  Disabled last failing test
  I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
  r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
  Re-enabled bytes warning code
........
  r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
  Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
  r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
  Re-enabled bytearray subclassing - all tests are passing.
........
											
										 
											2008-03-26 12:49:49 +00:00
										 |  |  | else: | 
					
						
							| 
									
										
										
										
											2008-03-18 23:45:49 +00:00
										 |  |  |     # 2.x | 
					
						
							|  |  |  |     from StringIO import StringIO | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | NotDefined = object() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # A dispatch table all 8 combinations of providing | 
					
						
							|  |  |  | #  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 | 
					
						
							|  |  |  | #  arguments | 
					
						
							|  |  |  | dispatch = { | 
					
						
							|  |  |  |     (False, False, False): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(*args), | 
					
						
							|  |  |  |     (False, False, True): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(file=file, *args), | 
					
						
							|  |  |  |     (False, True,  False): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(end=end, *args), | 
					
						
							|  |  |  |     (False, True,  True): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(end=end, file=file, *args), | 
					
						
							|  |  |  |     (True,  False, False): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(sep=sep, *args), | 
					
						
							|  |  |  |     (True,  False, True): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(sep=sep, file=file, *args), | 
					
						
							|  |  |  |     (True,  True,  False): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(sep=sep, end=end, *args), | 
					
						
							|  |  |  |     (True,  True,  True): | 
					
						
							|  |  |  |      lambda args, sep, end, file: print(sep=sep, end=end, file=file, *args), | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # Class used to test __str__ and print | 
					
						
							|  |  |  | class ClassWith__str__: | 
					
						
							|  |  |  |     def __init__(self, x): | 
					
						
							|  |  |  |         self.x = x | 
					
						
							|  |  |  |     def __str__(self): | 
					
						
							|  |  |  |         return self.x | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class TestPrint(unittest.TestCase): | 
					
						
							|  |  |  |     def check(self, expected, args, | 
					
						
							|  |  |  |             sep=NotDefined, end=NotDefined, file=NotDefined): | 
					
						
							|  |  |  |         # Capture sys.stdout in a StringIO.  Call print with args, | 
					
						
							|  |  |  |         #  and with sep, end, and file, if they're defined.  Result | 
					
						
							|  |  |  |         #  must match expected. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # Look up the actual function to call, based on if sep, end, and file | 
					
						
							|  |  |  |         #  are defined | 
					
						
							|  |  |  |         fn = dispatch[(sep is not NotDefined, | 
					
						
							|  |  |  |                        end is not NotDefined, | 
					
						
							|  |  |  |                        file is not NotDefined)] | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-19 12:09:55 +00:00
										 |  |  |         with test_support.captured_stdout() as t: | 
					
						
							| 
									
										
										
										
											2008-03-18 23:45:49 +00:00
										 |  |  |             fn(args, sep, end, file) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEqual(t.getvalue(), expected) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_print(self): | 
					
						
							|  |  |  |         def x(expected, args, sep=NotDefined, end=NotDefined): | 
					
						
							|  |  |  |             # Run the test 2 ways: not using file, and using | 
					
						
							|  |  |  |             #  file directed to a StringIO | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             self.check(expected, args, sep=sep, end=end) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # When writing to a file, stdout is expected to be empty | 
					
						
							|  |  |  |             o = StringIO() | 
					
						
							|  |  |  |             self.check('', args, sep=sep, end=end, file=o) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # And o will contain the expected output | 
					
						
							|  |  |  |             self.assertEqual(o.getvalue(), expected) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         x('\n', ()) | 
					
						
							|  |  |  |         x('a\n', ('a',)) | 
					
						
							|  |  |  |         x('None\n', (None,)) | 
					
						
							|  |  |  |         x('1 2\n', (1, 2)) | 
					
						
							|  |  |  |         x('1   2\n', (1, ' ', 2)) | 
					
						
							|  |  |  |         x('1*2\n', (1, 2), sep='*') | 
					
						
							|  |  |  |         x('1 s', (1, 's'), end='') | 
					
						
							|  |  |  |         x('a\nb\n', ('a', 'b'), sep='\n') | 
					
						
							|  |  |  |         x('1.01', (1.0, 1), sep='', end='') | 
					
						
							|  |  |  |         x('1*a*1.3+', (1, 'a', 1.3), sep='*', end='+') | 
					
						
							|  |  |  |         x('a\n\nb\n', ('a\n', 'b'), sep='\n') | 
					
						
							|  |  |  |         x('\0+ +\0\n', ('\0', ' ', '\0'), sep='+') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         x('a\n b\n', ('a\n', 'b')) | 
					
						
							|  |  |  |         x('a\n b\n', ('a\n', 'b'), sep=None) | 
					
						
							|  |  |  |         x('a\n b\n', ('a\n', 'b'), end=None) | 
					
						
							|  |  |  |         x('a\n b\n', ('a\n', 'b'), sep=None, end=None) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         x('*\n', (ClassWith__str__('*'),)) | 
					
						
							|  |  |  |         x('abc 1\n', (ClassWith__str__('abc'), 1)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # 2.x unicode tests | 
					
						
							|  |  |  |         x(u'1 2\n', ('1', u'2')) | 
					
						
							|  |  |  |         x(u'u\1234\n', (u'u\1234',)) | 
					
						
							|  |  |  |         x(u'  abc 1\n', (' ', ClassWith__str__(u'abc'), 1)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # errors | 
					
						
							|  |  |  |         self.assertRaises(TypeError, print, '', sep=3) | 
					
						
							|  |  |  |         self.assertRaises(TypeError, print, '', end=3) | 
					
						
							|  |  |  |         self.assertRaises(AttributeError, print, '', file='') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | def test_main(): | 
					
						
							|  |  |  |     test_support.run_unittest(TestPrint) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | if __name__ == "__main__": | 
					
						
							|  |  |  |     test_main() |