From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 14 Nov 2018 10:36:47 +0000 (+0100)
Subject: bpo-35233: Fix test_embed.InitConfigTests on macOS (GH-10539)
X-Git-Tag: v3.7.2rc1~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc09ee8bc9c0ce4873cdaab6ca524a3ee3a36be1;p=thirdparty%2FPython%2Fcpython.git

bpo-35233: Fix test_embed.InitConfigTests on macOS (GH-10539)

On macOS and Windows, Py_HasFileSystemDefaultEncoding is 1 by
default.
---

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 856116fdbb17..6e2e212105f3 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -287,9 +287,10 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         'Py_VerboseFlag': 0,
     }
     if os.name == 'nt':
-        DEFAULT_GLOBAL_CONFIG['Py_HasFileSystemDefaultEncoding'] = 1
         DEFAULT_GLOBAL_CONFIG['Py_LegacyWindowsFSEncodingFlag'] = 0
         DEFAULT_GLOBAL_CONFIG['Py_LegacyWindowsStdioFlag'] = 0
+    if sys.platform in ('win32', 'darwin'):
+        DEFAULT_GLOBAL_CONFIG['Py_HasFileSystemDefaultEncoding'] = 1
 
     DEFAULT_CORE_CONFIG = {
         'install_signal_handlers': 1,