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 @@ | |||
1 | From b94995e0c694ec9561efec0d1a59b323340e6105 Mon Sep 17 00:00:00 2001 | 1 | From e11787d373baa6d7b0e0d94aff8ccd373203bfb1 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Tim Orling <ticotimo@gmail.com> |
3 | Date: Mon, 5 Aug 2019 15:57:39 +0800 | 3 | Date: Wed, 16 Jun 2021 07:49:52 -0700 |
4 | Subject: [PATCH] test_locale.py: correct the test output format | 4 | Subject: [PATCH] test_locale.py: correct the test output format |
5 | 5 | ||
6 | Before this patch: | 6 | Before this patch: |
@@ -24,23 +24,25 @@ Before this patch: | |||
24 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] | 24 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] |
25 | 25 | ||
26 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 26 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
27 | |||
28 | |||
29 | Refresh patch for upstream changes in 3.8.9 | ||
30 | |||
31 | Signed-off-by: Tim Orling <timothy.t.orling@intel.com> | ||
27 | --- | 32 | --- |
28 | Lib/test/test_locale.py | 2 +- | 33 | Lib/test/test_locale.py | 2 +- |
29 | 1 file changed, 1 insertion(+), 1 deletion(-) | 34 | 1 file changed, 1 insertion(+), 1 deletion(-) |
30 | 35 | ||
31 | diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py | 36 | diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py |
32 | index e2c2178..558d63c 100644 | 37 | index 39091c0..5050f3d 100644 |
33 | --- a/Lib/test/test_locale.py | 38 | --- a/Lib/test/test_locale.py |
34 | +++ b/Lib/test/test_locale.py | 39 | +++ b/Lib/test/test_locale.py |
35 | @@ -527,7 +527,7 @@ class TestMiscellaneous(unittest.TestCase): | 40 | @@ -563,7 +563,7 @@ class TestMiscellaneous(unittest.TestCase): |
36 | self.skipTest('test needs Turkish locale') | 41 | self.skipTest('test needs Turkish locale') |
37 | loc = locale.getlocale(locale.LC_CTYPE) | 42 | loc = locale.getlocale(locale.LC_CTYPE) |
38 | if verbose: | 43 | if verbose: |
39 | - print('testing with %a' % (loc,), end=' ', flush=True) | 44 | - print('testing with %a' % (loc,), end=' ', flush=True) |
40 | + print('testing with %a...' % (loc,), end=' ', flush=True) | 45 | + print('testing with %a...' % (loc,), end=' ', flush=True) |
41 | locale.setlocale(locale.LC_CTYPE, loc) | 46 | try: |
42 | self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) | 47 | locale.setlocale(locale.LC_CTYPE, loc) |
43 | 48 | except locale.Error as exc: | |
44 | -- | ||
45 | 2.7.4 | ||
46 | |||