mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Close #11022: TextIOWrapper doesn't call locale.setlocale() anymore
open() and io.TextIOWrapper are now calling locale.getpreferredencoding(False) instead of locale.getpreferredencoding() in text mode if the encoding is not specified. Don't change temporary the locale encoding using locale.setlocale(), use the current locale encoding instead of the user preferred encoding. Explain also in open() documentation that locale.getpreferredencoding(False) is called if the encoding is not specified.
This commit is contained in:
parent
91c5a34613
commit
f86a5e8a93
8 changed files with 84 additions and 29 deletions
|
@ -1,20 +1,21 @@
|
|||
# Python test set -- built-in functions
|
||||
|
||||
import platform
|
||||
import unittest
|
||||
import sys
|
||||
import warnings
|
||||
import ast
|
||||
import builtins
|
||||
import collections
|
||||
import io
|
||||
import locale
|
||||
import os
|
||||
import ast
|
||||
import types
|
||||
import builtins
|
||||
import random
|
||||
import traceback
|
||||
from test.support import TESTFN, unlink, run_unittest, check_warnings
|
||||
from operator import neg
|
||||
import pickle
|
||||
import platform
|
||||
import random
|
||||
import sys
|
||||
import traceback
|
||||
import types
|
||||
import unittest
|
||||
import warnings
|
||||
from operator import neg
|
||||
from test.support import TESTFN, unlink, run_unittest, check_warnings
|
||||
try:
|
||||
import pty, signal
|
||||
except ImportError:
|
||||
|
@ -961,6 +962,27 @@ class BuiltinTest(unittest.TestCase):
|
|||
fp.close()
|
||||
unlink(TESTFN)
|
||||
|
||||
def test_open_default_encoding(self):
|
||||
old_environ = dict(os.environ)
|
||||
try:
|
||||
# try to get a user preferred encoding different than the current
|
||||
# locale encoding to check that open() uses the current locale
|
||||
# encoding and not the user preferred encoding
|
||||
for key in ('LC_ALL', 'LANG', 'LC_CTYPE'):
|
||||
if key in os.environ:
|
||||
del os.environ[key]
|
||||
|
||||
self.write_testfile()
|
||||
current_locale_encoding = locale.getpreferredencoding(False)
|
||||
fp = open(TESTFN, 'w')
|
||||
try:
|
||||
self.assertEqual(fp.encoding, current_locale_encoding)
|
||||
finally:
|
||||
fp.close()
|
||||
finally:
|
||||
os.environ.clear()
|
||||
os.environ.update(old_environ)
|
||||
|
||||
def test_ord(self):
|
||||
self.assertEqual(ord(' '), 32)
|
||||
self.assertEqual(ord('A'), 65)
|
||||
|
|
|
@ -19,20 +19,21 @@
|
|||
# test both implementations. This file has lots of examples.
|
||||
################################################################################
|
||||
|
||||
import abc
|
||||
import array
|
||||
import errno
|
||||
import locale
|
||||
import os
|
||||
import pickle
|
||||
import random
|
||||
import signal
|
||||
import sys
|
||||
import time
|
||||
import array
|
||||
import random
|
||||
import unittest
|
||||
import weakref
|
||||
import abc
|
||||
import signal
|
||||
import errno
|
||||
import warnings
|
||||
import pickle
|
||||
from itertools import cycle, count
|
||||
import weakref
|
||||
from collections import deque
|
||||
from itertools import cycle, count
|
||||
from test import support
|
||||
|
||||
import codecs
|
||||
|
@ -1881,6 +1882,24 @@ class TextIOWrapperTest(unittest.TestCase):
|
|||
t.write("A\rB")
|
||||
self.assertEqual(r.getvalue(), b"XY\nZA\rB")
|
||||
|
||||
def test_default_encoding(self):
|
||||
old_environ = dict(os.environ)
|
||||
try:
|
||||
# try to get a user preferred encoding different than the current
|
||||
# locale encoding to check that TextIOWrapper() uses the current
|
||||
# locale encoding and not the user preferred encoding
|
||||
for key in ('LC_ALL', 'LANG', 'LC_CTYPE'):
|
||||
if key in os.environ:
|
||||
del os.environ[key]
|
||||
|
||||
current_locale_encoding = locale.getpreferredencoding(False)
|
||||
b = self.BytesIO()
|
||||
t = self.TextIOWrapper(b)
|
||||
self.assertEqual(t.encoding, current_locale_encoding)
|
||||
finally:
|
||||
os.environ.clear()
|
||||
os.environ.update(old_environ)
|
||||
|
||||
def test_encoding(self):
|
||||
# Check the encoding attribute is always set, and valid
|
||||
b = self.BytesIO()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue