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.
........

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 542986c06ebd3cba8080fe69642079be67e598c5..632d5e3b509f38f38bd43493c323a1f961c622fe 100644 (file)
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -145,9 +145,9 @@ class TclTest(unittest.TestCase):
 
         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)