diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-03-08 06:48:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 06:48:09 (GMT) |
| commit | 21a74312f2d1ddee71fade709af49d078085ec30 (patch) | |
| tree | 4b9024121286fc12c97cb329f39d3d8620067721 | |
| parent | ad4a0cc519a5bb14204324e0e32e976318f9e6ce (diff) | |
| download | cpython-21a74312f2d1ddee71fade709af49d078085ec30.zip cpython-21a74312f2d1ddee71fade709af49d078085ec30.tar.gz cpython-21a74312f2d1ddee71fade709af49d078085ec30.tar.bz2 | |
Revert "bpo-29571: Use correct locale encoding in test_re (#149)" (#554)
This reverts commit ace5c0fdd9b962e6e886c29dbcea72c53f051dc4.
| -rw-r--r-- | Lib/test/test_re.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 92d2c13..1d7fb76 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -1399,7 +1399,7 @@ class ReTests(unittest.TestCase): def test_locale_flag(self): import locale - enc = locale.getpreferredencoding(False) + _, enc = locale.getlocale(locale.LC_CTYPE) # Search non-ASCII letter for i in range(128, 256): try: @@ -911,15 +911,6 @@ Tools/Demos Tests ----- -- bpo-28087: Skip test_asyncore and test_eintr poll failures on macOS. - Skip some tests of select.poll when running on macOS due to unresolved - issues with the underlying system poll function on some macOS versions. - -- Issue #29571: to match the behaviour of the ``re.LOCALE`` flag, - test_re.test_locale_flag now uses ``locale.getpreferredencoding(False)`` to - determine the candidate encoding for the test regex (allowing it to correctly - skip the test when the default locale encoding is a multi-byte encoding) - - Issue #24932: Use proper command line parsing in _testembed - Issue #28950: Disallow -j0 to be combined with -T/-l in regrtest |