commit 21220bbe65108f5a763ead24a6b572f80d84c9e2
author Victor Stinner <vstinner@redhat.com> Tue Oct 30 12:59:20 2018 +0100
committer GitHub <noreply@github.com> Tue Oct 30 12:59:20 2018 +0100
tree 9461c9327a7b4129f2a67dd256d1e23993cc906b
parent 58f7bf3a892031616a6b06ef4b8d36e2ebec172b

bpo-34403: Fix initfsencoding() for ASCII (GH-10233)

* Add _Py_GetForceASCII(): check if Python forces the usage of ASCII
  in Py_DecodeLocale() and Py_EncodeLocale().
* initfsencoding() now uses ASCII if _Py_GetForceASCII() is true.

Python/pylifecycle.c

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index ba4b548..c01b21f 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1615,6 +1615,10 @@
         Py_FileSystemDefaultEncoding = "utf-8";
         Py_HasFileSystemDefaultEncoding = 1;
     }
+    else if (_Py_GetForceASCII()) {
+        Py_FileSystemDefaultEncoding = "ascii";
+        Py_HasFileSystemDefaultEncoding = 1;
+    }
     else if (Py_FileSystemDefaultEncoding == NULL) {
         Py_FileSystemDefaultEncoding = get_locale_encoding();
         if (Py_FileSystemDefaultEncoding == NULL) {