gh-153333: Move readprofile test to TkTest and cover two encodings

Author: tonghuaroot

Lib/test/test_tkinter/test_misc.py

@@ -5,7 +5,6 @@
 import sys
 import textwrap
 import unittest
-import warnings
 import weakref
 import tkinter
 from tkinter import TclError
@@ -366,24 +365,6 @@ def test_getdouble(self):
         self.assertEqual(self.root.getdouble(3), 3.0)
         self.assertRaises(ValueError, self.root.getdouble, 'spam')
 
-    def test_readprofile(self):
-        # gh-153333: readprofile() reads the profile scripts with the source
-        # file's encoding (here a Latin-1 coding cookie), not the locale
-        # default encoding.
-        name = 'readprofiletest'
-        script = ("# -*- coding: latin-1 -*-\n"
-                  "self.readprofile_result = 'caf\xe9'\n")
-        self.addCleanup(self.root.__dict__.pop, 'readprofile_result', None)
-        with os_helper.temp_dir() as home:
-            with open(os.path.join(home, '.%s.py' % name), 'wb') as f:
-                f.write(script.encode('latin-1'))
-            with os_helper.EnvironmentVarGuard() as env:
-                env['HOME'] = home
-                with warnings.catch_warnings():
-                    warnings.simplefilter('error', EncodingWarning)
-                    self.root.readprofile(name, name)
-        self.assertEqual(self.root.readprofile_result, 'caf\xe9')
-
     def test_getvar(self):
         self.root.setvar('test_var', 'hello')
         self.assertEqual(self.root.getvar('test_var'), 'hello')
@@ -829,6 +810,26 @@ def test_iterable_protocol(self):
 
 class TkTest(AbstractTkTest, unittest.TestCase):
 
+    def test_readprofile(self):
+        # gh-153333: profile scripts are decoded with their own coding cookie,
+        # not the locale encoding.  Two cookies so no locale can mask the bug.
+        profiles = {
+            '.RpClass.py': ('latin-1', "self._rp_latin1 = 'caf\xe9'"),
+            '.rpbase.py': ('utf-8', "self._rp_utf8 = 'caf\xe9'"),
+        }
+        self.addCleanup(self.root.__dict__.pop, '_rp_latin1', None)
+        self.addCleanup(self.root.__dict__.pop, '_rp_utf8', None)
+        with (os_helper.temp_dir() as home,
+              os_helper.EnvironmentVarGuard() as env):
+            env['HOME'] = home
+            for filename, (encoding, body) in profiles.items():
+                script = '# -*- coding: %s -*-\n%s\n' % (encoding, body)
+                with open(os.path.join(home, filename), 'wb') as f:
+                    f.write(script.encode(encoding))
+            self.root.readprofile('rpbase', 'RpClass')
+        self.assertEqual(self.root._rp_latin1, 'caf\xe9')
+        self.assertEqual(self.root._rp_utf8, 'caf\xe9')
+
     def test_className(self):
         # The className argument sets the class of the root window.  Tk
         # title-cases it: the first letter is upper-cased, the rest lower-cased.