From 26024771dfe131dc39d4e4664c5194a69b47c48c Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Fri, 19 Jan 2018 17:36:05 +0100 Subject: [PATCH] Fix localeconv() encoding for LC_NUMERIC --- 00273-skip-float-test.patch | 12 ------------ python3.spec | 11 +++++++---- 2 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 00273-skip-float-test.patch diff --git a/00273-skip-float-test.patch b/00273-skip-float-test.patch deleted file mode 100644 index 233d3ed..0000000 --- a/00273-skip-float-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py -index 66726d6496d..3318fa5df59 100644 ---- a/Lib/test/test_float.py -+++ b/Lib/test/test_float.py -@@ -141,6 +141,7 @@ class GeneralFloatCases(unittest.TestCase): - # non-UTF-8 byte string - check(b'123\xa0') - -+ @unittest.skip('Fails in Koji: https://bugzilla.redhat.com/show_bug.cgi?id=1484497') - @support.run_with_locale('LC_NUMERIC', 'fr_FR', 'de_DE') - def test_float_with_comma(self): - # set locale to something that doesn't use '.' for the decimal point diff --git a/python3.spec b/python3.spec index 96416ce..d2962bc 100644 --- a/python3.spec +++ b/python3.spec @@ -14,7 +14,7 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well Version: %{pybasever}.4 -Release: 4%{?dist} +Release: 5%{?dist} License: Python @@ -342,9 +342,9 @@ Patch262: 00262-pep538_coerce_legacy_c_locale.patch Patch264: 00264-skip-test-failing-on-aarch64.patch # 00273 # -# Skip test_float_with_comma, which fails in Koji with UnicodeDecodeError -# See https://bugzilla.redhat.com/show_bug.cgi?id=1484497 -Patch273: 00273-skip-float-test.patch +# Fix localeconv() encoding for LC_NUMERIC +# Fixed upstream: https://bugs.python.org/issue31900 +Patch273: 00273-fix-localeconv-encoding-for-LC_NUMERIC.patch # 00274 # # Upstream uses Debian-style architecture naming. Change to match Fedora. @@ -1489,6 +1489,9 @@ fi # ====================================================== %changelog +* Fri Jan 19 2018 Charalampos Stratakis - 3.6.4-5 +- Fix localeconv() encoding for LC_NUMERIC + * Thu Jan 18 2018 Igor Gnatenko - 3.6.4-4 - R: gdbm-devel → R: gdbm for python3-libs