From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 15 Jul 2017 12:51:05 +0000 (+1000)
Subject: bpo-30836: fix test_c_locale_coercion on AIX (GH-2713)
X-Git-Tag: v3.7.0a1~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b6a261bb8cbede42296e0cc70956fb3b9a6cf7;p=thirdparty%2FPython%2Fcpython.git

bpo-30836: fix test_c_locale_coercion on AIX (GH-2713)

AIX uses iso8859-1 in the C locale, not ASCII

AIX doesn't currently provide any of the locale
coercion locales, but we leave locale coercion
enabled in case one gets added in the future.
---

diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index f5a9fe34847a..635c98faced9 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -17,7 +17,14 @@ from test.support.script_helper import (
 
 # Set our expectation for the default encoding used in the C locale
 # for the filesystem encoding and the standard streams
-C_LOCALE_STREAM_ENCODING = "ascii"
+
+# AIX uses iso8859-1 in the C locale, other *nix platforms use ASCII
+if sys.platform.startswith("aix"):
+    C_LOCALE_STREAM_ENCODING = "iso8859-1"
+else:
+    C_LOCALE_STREAM_ENCODING = "ascii"
+
+# FS encoding is UTF-8 on macOS, other *nix platforms use the locale encoding
 if sys.platform == "darwin":
     C_LOCALE_FS_ENCODING = "utf-8"
 else: