From cef8b1741c03a09ea7371947dc65f632c61ef8ad Mon Sep 17 00:00:00 2001 From: Sean McCully Date: Sat, 20 May 2017 21:44:02 -0400 Subject: [PATCH] bpo-30409: locale.getpreferredencoding doesn't return result (#1672) --- Lib/locale.py | 23 ++++++++++------------- Misc/ACKS | 1 + 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Lib/locale.py b/Lib/locale.py index be34c5ddcd..62aad5ae7b 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -617,22 +617,19 @@ else: except Error: pass result = nl_langinfo(CODESET) - if not result and sys.platform == 'darwin': - # nl_langinfo can return an empty string - # when the setting has an invalid value. - # Default to UTF-8 in that case because - # UTF-8 is the default charset on OSX and - # returning nothing will crash the - # interpreter. - result = 'UTF-8' - setlocale(LC_CTYPE, oldloc) - return result else: result = nl_langinfo(CODESET) - if not result and sys.platform == 'darwin': - # See above for explanation - result = 'UTF-8' + + if not result and sys.platform == 'darwin': + # nl_langinfo can return an empty string + # when the setting has an invalid value. + # Default to UTF-8 in that case because + # UTF-8 is the default charset on OSX and + # returning nothing will crash the + # interpreter. + result = 'UTF-8' + return result ### Database diff --git a/Misc/ACKS b/Misc/ACKS index 10b5d7c84e..b7b58a7b1c 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -904,6 +904,7 @@ Arnaud Mazin Pam McA'Nulty Matt McClure Rebecca McCreary +Sean McCully Kirk McDonald Chris McDonough Greg McFarlane -- 2.50.1