diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch index 35b7e0c480..f9d2eadc11 100644 --- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch +++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch @@ -1,6 +1,6 @@ -From b94995e0c694ec9561efec0d1a59b323340e6105 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Mon, 5 Aug 2019 15:57:39 +0800 +From e11787d373baa6d7b0e0d94aff8ccd373203bfb1 Mon Sep 17 00:00:00 2001 +From: Tim Orling <ticotimo@gmail.com> +Date: Wed, 16 Jun 2021 07:49:52 -0700 Subject: [PATCH] test_locale.py: correct the test output format Before this patch: @@ -24,23 +24,25 @@ Before this patch: Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + + +Refresh patch for upstream changes in 3.8.9 + +Signed-off-by: Tim Orling <timothy.t.orling@intel.com> --- Lib/test/test_locale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py -index e2c2178..558d63c 100644 +index 39091c0..5050f3d 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py -@@ -527,7 +527,7 @@ class TestMiscellaneous(unittest.TestCase): +@@ -563,7 +563,7 @@ class TestMiscellaneous(unittest.TestCase): self.skipTest('test needs Turkish locale') loc = locale.getlocale(locale.LC_CTYPE) if verbose: - print('testing with %a' % (loc,), end=' ', flush=True) + print('testing with %a...' % (loc,), end=' ', flush=True) - locale.setlocale(locale.LC_CTYPE, loc) - self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) - --- -2.7.4 - + try: + locale.setlocale(locale.LC_CTYPE, loc) + except locale.Error as exc: |