From ac06deac652cca79cce036f8acf81decbd86a82c Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 28 Aug 2017 15:50:56 +0200 Subject: [PATCH] Remove patch 188, a temporary workaround for hashlib tests --- ...s-when-hashlib-doesnt-compile-properly.patch | 11 ----------- python3.spec | 17 +---------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 00188-fix-lib2to3-tests-when-hashlib-doesnt-compile-properly.patch diff --git a/00188-fix-lib2to3-tests-when-hashlib-doesnt-compile-properly.patch b/00188-fix-lib2to3-tests-when-hashlib-doesnt-compile-properly.patch deleted file mode 100644 index 90af30d..0000000 --- a/00188-fix-lib2to3-tests-when-hashlib-doesnt-compile-properly.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r 28c04e954bb6 Lib/lib2to3/main.py ---- a/Lib/lib2to3/main.py Tue Oct 29 22:25:55 2013 -0400 -+++ b/Lib/lib2to3/main.py Wed Nov 06 14:33:07 2013 +0100 -@@ -213,6 +213,7 @@ - - # Set up logging handler - level = logging.DEBUG if options.verbose else logging.INFO -+ logging.root.handlers = [] - logging.basicConfig(format='%(name)s: %(message)s', level=level) - logger = logging.getLogger('lib2to3.main') - diff --git a/python3.spec b/python3.spec index 3cffc87..fe52e47 100644 --- a/python3.spec +++ b/python3.spec @@ -328,21 +328,6 @@ Patch178: 00178-dont-duplicate-flags-in-sysconfig.patch # Not appropriate for upstream, Fedora-specific naming Patch180: 00180-python-add-support-for-ppc64p7.patch -# 00188 # -# Downstream only patch that should be removed when we compile all guaranteed -# hashlib algorithms properly. The problem is this: -# - during tests, test_hashlib is imported and executed before test_lib2to3 -# - if at least one hash function has failed, trying to import it triggers an -# exception that is being caught and exception is logged: -# http://hg.python.org/cpython/file/2de806c8b070/Lib/hashlib.py#l217 -# - logging the exception makes logging module run basicConfig -# - when lib2to3 tests are run again, lib2to3 runs basicConfig again, which -# doesn't do anything, because it was run previously -# (logging.root.handlers != []), which means that the default setup -# (most importantly logging level) is not overriden. That means that a test -# relying on this will fail (test_filename_changing_on_output_single_dir) -Patch188: 00188-fix-lib2to3-tests-when-hashlib-doesnt-compile-properly.patch - # 00189 # # Add the rewheel module, allowing to recreate wheels from already installed # ones @@ -667,7 +652,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en %patch170 -p1 %patch178 -p1 %patch180 -p1 -%patch188 -p1 %if %{with rewheel} %patch189 -p1 @@ -1653,6 +1637,7 @@ fi - Merge lib64 patches (104 into 102) - Skip test_bdist_rpm using test config rather than a patch (removes patch 137) - Remove patches 157 and 186, which had test changes left over after upstreaming +- Remove patch 188, a temporary workaround for hashlib tests * Mon Aug 28 2017 Michal Cyprian - 3.6.2-12 - Use python3 style of calling super() without arguments in rpath