From: Michael Felt <aixtools@users.noreply.github.com>
Date: Wed, 19 Jun 2019 20:07:34 +0000 (+0200)
Subject: [3.7] bpo-34347: Fix test_utf8_mode.test_cmd_line for AIX (GH-8923) (GH-14233)
X-Git-Tag: v3.7.5rc1~318
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15e7d2432294ec46f1ad84ce958fdeb9d4ca78b1;p=thirdparty%2FPython%2Fcpython.git

[3.7] bpo-34347: Fix test_utf8_mode.test_cmd_line for AIX (GH-8923) (GH-14233)
---

diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py
index 554abfab3163..06fe1979ddcc 100644
--- a/Lib/test/test_utf8_mode.py
+++ b/Lib/test/test_utf8_mode.py
@@ -228,6 +228,8 @@ class UTF8ModeTests(unittest.TestCase):
 
         if sys.platform == 'darwin' or support.is_android:
             c_arg = arg_utf8
+        elif sys.platform.startswith("aix"):
+            c_arg = arg.decode('iso-8859-1')
         else:
             c_arg = arg_ascii
         for loc in POSIX_LOCALES:
diff --git a/Misc/NEWS.d/next/Tests/2018-08-25-13-28-18.bpo-34347.IsRDPB.rst b/Misc/NEWS.d/next/Tests/2018-08-25-13-28-18.bpo-34347.IsRDPB.rst
new file mode 100644
index 000000000000..e581f605f75a
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2018-08-25-13-28-18.bpo-34347.IsRDPB.rst
@@ -0,0 +1 @@
+Fix ``test_utf8_mode.test_cmd_line`` for AIX.  Patch by M. Felt