From 1588be66d7b0eeebc4614309cd0fc837ff52776a Mon Sep 17 00:00:00 2001
From: xdegaye <xdegaye@gmail.com>
Date: Sun, 12 Nov 2017 12:45:59 +0100
Subject: bpo-28180: Fix the implementation of PEP 538 on Android (GH-4334)

---
 Programs/python.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'Programs')

diff --git a/Programs/python.c b/Programs/python.c
index 4f6b9198c8..270a11babb 100644
--- a/Programs/python.c
+++ b/Programs/python.c
@@ -54,15 +54,8 @@ main(int argc, char **argv)
         return 1;
     }
 
-#ifdef __ANDROID__
-    /* Passing "" to setlocale() on Android requests the C locale rather
-     * than checking environment variables, so request C.UTF-8 explicitly
-     */
-    setlocale(LC_ALL, "C.UTF-8");
-#else
     /* Reconfigure the locale to the default for this process */
-    setlocale(LC_ALL, "");
-#endif
+    _Py_SetLocaleFromEnv(LC_ALL);
 
     /* The legacy C locale assumes ASCII as the default text encoding, which
      * causes problems not only for the CPython runtime, but also other
-- 
cgit v1.2.1