[Python-checkins] cpython: Issue 27372: Stop test_idle from changing locale, so test passes.

Sun Jun 26 17:48:16 EDT 2016

https://hg.python.org/cpython/rev/3ffdb9277054
changeset: 102184:3ffdb9277054
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun Jun 26 17:48:02 2016 -0400
summary:
 Issue 27372: Stop test_idle from changing locale, so test passes.
In 3.6, the warning is now called an error, making it harder to ignore.
files:
 Lib/idlelib/__init__.py | 1 +
 Lib/idlelib/editor.py | 8 +-
 Lib/idlelib/iomenu.py | 88 +++++++++++++++-------------
 Lib/test/test_idle.py | 15 ++-
 4 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/Lib/idlelib/__init__.py b/Lib/idlelib/__init__.py
--- a/Lib/idlelib/__init__.py
+++ b/Lib/idlelib/__init__.py
@@ -7,3 +7,4 @@
 The other files are private implementations. Their details are subject to
 change. See PEP 434 for more. Import them at your own risk.
 """
+testing = False # Set True by test.test_idle.
diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -26,8 +26,8 @@
 
 # The default tab setting for a Text widget, in average-width characters.
 TK_TABWIDTH_DEFAULT = 8
+_py_version = ' (%s)' % platform.python_version()
 
-_py_version = ' (%s)' % platform.python_version()
 
 def _sphinx_version():
 "Format sys.version_info to produce the Sphinx version string used to install the chm docs"
@@ -45,11 +45,12 @@
 from idlelib.percolator import Percolator
 from idlelib.colorizer import ColorDelegator, color_config
 from idlelib.undo import UndoDelegator
- from idlelib.iomenu import IOBinding, filesystemencoding, encoding
+ from idlelib.iomenu import IOBinding, encoding
 from idlelib import mainmenu
 from tkinter import Toplevel
 from idlelib.statusbar import MultiStatusBar
 
+ filesystemencoding = sys.getfilesystemencoding() # for file names
 help_url = None
 
 def __init__(self, flist=None, filename=None, key=None, root=None):
@@ -1649,5 +1650,8 @@
 # edit.text.bind("<<close-window>>", edit.close_event)
 
 if __name__ == '__main__':
+ import unittest
+ unittest.main('idlelib.idle_test.test_editor', verbosity=2, exit=False)
+
 from idlelib.idle_test.htest import run
 run(_editor_window)
diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py
--- a/Lib/idlelib/iomenu.py
+++ b/Lib/idlelib/iomenu.py
@@ -10,57 +10,60 @@
 import tkinter.messagebox as tkMessageBox
 from tkinter.simpledialog import askstring
 
+import idlelib
 from idlelib.config import idleConf
 
+if idlelib.testing: # Set True by test.test_idle to avoid setlocale.
+ encoding = 'utf-8'
+else:
+ # Try setting the locale, so that we can find out
+ # what encoding to use
+ try:
+ import locale
+ locale.setlocale(locale.LC_CTYPE, "")
+ except (ImportError, locale.Error):
+ pass
 
-# Try setting the locale, so that we can find out
-# what encoding to use
-try:
- import locale
- locale.setlocale(locale.LC_CTYPE, "")
-except (ImportError, locale.Error):
- pass
-
-# Encoding for file names
-filesystemencoding = sys.getfilesystemencoding() ### currently unused
-
-locale_encoding = 'ascii'
-if sys.platform == 'win32':
- # On Windows, we could use "mbcs". However, to give the user
- # a portable encoding name, we need to find the code page
- try:
- locale_encoding = locale.getdefaultlocale()[1]
- codecs.lookup(locale_encoding)
- except LookupError:
- pass
-else:
- try:
- # Different things can fail here: the locale module may not be
- # loaded, it may not offer nl_langinfo, or CODESET, or the
- # resulting codeset may be unknown to Python. We ignore all
- # these problems, falling back to ASCII
- locale_encoding = locale.nl_langinfo(locale.CODESET)
- if locale_encoding is None or locale_encoding is '':
- # situation occurs on Mac OS X
- locale_encoding = 'ascii'
- codecs.lookup(locale_encoding)
- except (NameError, AttributeError, LookupError):
- # Try getdefaultlocale: it parses environment variables,
- # which may give a clue. Unfortunately, getdefaultlocale has
- # bugs that can cause ValueError.
+ locale_decode = 'ascii'
+ if sys.platform == 'win32':
+ # On Windows, we could use "mbcs". However, to give the user
+ # a portable encoding name, we need to find the code page
 try:
 locale_encoding = locale.getdefaultlocale()[1]
+ codecs.lookup(locale_encoding)
+ except LookupError:
+ pass
+ else:
+ try:
+ # Different things can fail here: the locale module may not be
+ # loaded, it may not offer nl_langinfo, or CODESET, or the
+ # resulting codeset may be unknown to Python. We ignore all
+ # these problems, falling back to ASCII
+ locale_encoding = locale.nl_langinfo(locale.CODESET)
 if locale_encoding is None or locale_encoding is '':
 # situation occurs on Mac OS X
 locale_encoding = 'ascii'
 codecs.lookup(locale_encoding)
- except (ValueError, LookupError):
- pass
+ except (NameError, AttributeError, LookupError):
+ # Try getdefaultlocale: it parses environment variables,
+ # which may give a clue. Unfortunately, getdefaultlocale has
+ # bugs that can cause ValueError.
+ try:
+ locale_encoding = locale.getdefaultlocale()[1]
+ if locale_encoding is None or locale_encoding is '':
+ # situation occurs on Mac OS X
+ locale_encoding = 'ascii'
+ codecs.lookup(locale_encoding)
+ except (ValueError, LookupError):
+ pass
 
-locale_encoding = locale_encoding.lower()
+ locale_encoding = locale_encoding.lower()
 
-encoding = locale_encoding ### KBK 07Sep07 This is used all over IDLE, check!
- ### 'encoding' is used below in encode(), check!
+ encoding = locale_encoding
+ # Encoding is used in multiple files; locale_encoding nowhere.
+ # The only use of 'encoding' below is in _decode as initial value
+ # of deprecated block asking user for encoding.
+ # Perhaps use elsewhere should be reviewed.
 
 coding_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)', re.ASCII)
 blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)', re.ASCII)
@@ -304,7 +307,7 @@
 "The file's encoding is invalid for Python 3.x.\n"
 "IDLE will convert it to UTF-8.\n"
 "What is the current encoding of the file?",
- initialvalue = locale_encoding,
+ initialvalue = encoding,
 parent = self.editwin.text)
 
 if enc:
@@ -564,5 +567,8 @@
 IOBinding(editwin)
 
 if __name__ == "__main__":
+ import unittest
+ unittest.main('idlelib.idle_test.test_iomenu', verbosity=2, exit=False)
+
 from idlelib.idle_test.htest import run
 run(_io_binding)
diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py
--- a/Lib/test/test_idle.py
+++ b/Lib/test/test_idle.py
@@ -1,18 +1,21 @@
 import unittest
 from test.support import import_module
 
-# Skip test if _thread or _tkinter wasn't built or idlelib was deleted.
+# Skip test if _thread or _tkinter wasn't built, or idlelib is missing,
+# or if tcl/tk version before 8.5, which is needed for ttk widgets.
+
 import_module('threading') # imported by PyShell, imports _thread
 tk = import_module('tkinter') # imports _tkinter
 if tk.TkVersion < 8.5:
 raise unittest.SkipTest("IDLE requires tk 8.5 or later.")
 tk.NoDefaultRoot()
-idletest = import_module('idlelib.idle_test')
+idlelib = import_module('idlelib')
+idlelib.testing = True # Avoid locale-changed test error
 
-# Without test_main present, regrtest.runtest_inner (line1219) calls
-# unittest.TestLoader().loadTestsFromModule(this_module) which calls
-# load_tests() if it finds it. (Unittest.main does the same.)
-load_tests = idletest.load_tests
+# Without test_main present, test.libregrtest.runtest.runtest_inner
+# calls (line 173) unittest.TestLoader().loadTestsFromModule(module)
+# which calls load_tests() if it finds it. (Unittest.main does the same.)
+from idlelib.idle_test import load_tests
 
 if __name__ == '__main__':
 unittest.main(verbosity=2, exit=False)
-- 
Repository URL: https://hg.python.org/cpython
