From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 25 Jun 2020 12:04:56 +0000 (-0700)
Subject: bpo-41113: Fix test_warnings on non-Western locales. (GH-21143)
X-Git-Tag: v3.8.4rc1~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f547d06ea7db23bb0a2cf81ff85478746efa958e;p=thirdparty%2FPython%2Fcpython.git

bpo-41113: Fix test_warnings on non-Western locales. (GH-21143)

(cherry picked from commit 0f8ec1fff01173803645ad6a8aea24997bf66fc1)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py
index 985adc1cda78..7b0d06b32019 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -1199,13 +1199,13 @@ class EnvironmentVariableTests(BaseTest):
     @unittest.skipUnless(sys.getfilesystemencoding() != 'ascii',
                          'requires non-ascii filesystemencoding')
     def test_nonascii(self):
+        PYTHONWARNINGS="ignore:DeprecationWarning" + (support.FS_NONASCII or '')
         rc, stdout, stderr = assert_python_ok("-c",
             "import sys; sys.stdout.write(str(sys.warnoptions))",
             PYTHONIOENCODING="utf-8",
-            PYTHONWARNINGS="ignore:DeprecaciónWarning",
+            PYTHONWARNINGS=PYTHONWARNINGS,
             PYTHONDEVMODE="")
-        self.assertEqual(stdout,
-            "['ignore:DeprecaciónWarning']".encode('utf-8'))
+        self.assertEqual(stdout, str([PYTHONWARNINGS]).encode())
 
 class CEnvironmentVariableTests(EnvironmentVariableTests, unittest.TestCase):
     module = c_warnings