diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-03-21 01:11:52 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-03-21 01:11:52 +0000 |
| commit | 02781dc7541b79e499c06ead64535c317efc460e (patch) | |
| tree | 71c1b357dcf08877c717b65048f75cb4e1d08cd2 /Lib/test/test_print.py | |
| parent | 3fd139951c677929c3131765a78ba6c18248b74e (diff) | |
| download | cpython-02781dc7541b79e499c06ead64535c317efc460e.tar.gz cpython-02781dc7541b79e499c06ead64535c317efc460e.zip | |
Merged revisions 61672,61674,61676-61678,61681,61683-61684 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61672 | brett.cannon | 2008-03-20 17:13:48 +0100 (Do, 20 Mär 2008) | 2 lines
Gave Jerry Seutter svn access for general Python development.
........
r61674 | marc-andre.lemburg | 2008-03-20 18:31:36 +0100 (Do, 20 Mär 2008) | 7 lines
If Mark Hammonds win32 tools are not available, try to use the _winreg module
and sys.getwindowsversion() to get at the Windows version info.
For the machine and processor uname() values, use the environment variables
for these on Windows XP and later.
........
r61676 | marc-andre.lemburg | 2008-03-20 18:55:31 +0100 (Do, 20 Mär 2008) | 5 lines
Add documentation for updated Windows support in win32_ver().
Add documentation for linux_distribution() API.
........
r61677 | marc-andre.lemburg | 2008-03-20 19:08:00 +0100 (Do, 20 Mär 2008) | 2 lines
Add news items for platform module changes.
........
r61678 | marc-andre.lemburg | 2008-03-20 19:58:14 +0100 (Do, 20 Mär 2008) | 3 lines
Clarfiy the availability of the extended support for win32_ver() in Py2.6.
........
r61681 | andrew.kuchling | 2008-03-20 23:49:26 +0100 (Do, 20 Mär 2008) | 1 line
Add lots of items
........
r61683 | eric.smith | 2008-03-21 00:04:04 +0100 (Fr, 21 Mär 2008) | 1 line
Fixed PEP name.
........
r61684 | eric.smith | 2008-03-21 00:56:08 +0100 (Fr, 21 Mär 2008) | 1 line
Comment how 'from __future__ import print_function' operates in 3.0.
........
Diffstat (limited to 'Lib/test/test_print.py')
| -rw-r--r-- | Lib/test/test_print.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py index 4d347ed0fca..58ca06988a0 100644 --- a/Lib/test/test_print.py +++ b/Lib/test/test_print.py @@ -1,6 +1,8 @@ """Test correct operation of the print function. """ +# In 2.6, this gives us the behavior we want. In 3.0, it has +# no function, but it still must parse correctly. from __future__ import print_function import unittest |