[Python-checkins] r84960 - in python/branches/release31-maint: Lib/test/test_tcl.py

Tue Sep 21 21:12:39 CEST 2010

Author: hirokazu.yamamoto
Date: Tue Sep 21 21:12:39 2010
New Revision: 84960
Log:
Merged revisions 84876 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r84876 | hirokazu.yamamoto | 2010年09月18日 13:42:41 +0900 | 1 line
 
 In Python3000, Tkinter was renamed to tkinter. And print is now function.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/test/test_tcl.py
Modified: python/branches/release31-maint/Lib/test/test_tcl.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_tcl.py	(original)
+++ python/branches/release31-maint/Lib/test/test_tcl.py	Tue Sep 21 21:12:39 2010
@@ -145,9 +145,9 @@
 
 with support.EnvironmentVarGuard() as env:
 env.unset("TCL_LIBRARY")
- f = os.popen('%s -c "import Tkinter; print Tkinter"' % (unc_name,))
+ f = os.popen('%s -c "import tkinter; print(tkinter)"' % (unc_name,))
 
- self.assert_('Tkinter.py' in f.read())
+ self.assertIn('tkinter', f.read())
 # exit code must be zero
 self.assertEqual(f.close(), None)
 
