From 44f3eb8f4cd5d508ca23f951884e580e066f791c Mon Sep 17 00:00:00 2001 From: Katerina Koukiou Date: Tue, 16 Apr 2024 17:20:17 +0200 Subject: [PATCH] Remove threading compatibility layer We cannot have a module called 'threading', otherwise the build will fail with the traceback below. Remove this file as it was anyhow meant to be an intermediate compatibility solution. The traceback from the build: Traceback (most recent call last): File "", line 2, in File "/usr/lib64/python3.12/py_compile.py", line 9, in import importlib.util File "", line 16, in File "/builddir/build/BUILD/anaconda-41.10/pyanaconda/threading.py", line 21, in from pyanaconda.core.threads import thread_manager as threadMgr ModuleNotFoundError: No module named 'pyanaconda' Resolves: rhbz#2275279 --- pyanaconda/threading.py | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 pyanaconda/threading.py diff --git a/pyanaconda/threading.py b/pyanaconda/threading.py deleted file mode 100644 index 8689e5da974..00000000000 --- a/pyanaconda/threading.py +++ /dev/null @@ -1,24 +0,0 @@ -# Compatibility layer for 3rd party addons and initial setup that did not update their imports yet -# FIXME: remove this file in Fedora 39 or 40 -# -# Copyright (C) 2023 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions of -# the GNU General Public License v.2, or (at your option) any later version. -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY expressed or implied, including the implied warranties of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. You should have received a copy of the -# GNU General Public License along with this program; if not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the -# source code or documentation are not subject to the GNU General Public -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. -# - -from pyanaconda.core.threads import thread_manager as threadMgr -from pyanaconda.core.threads import AnacondaThread, ThreadManager - -__all__ = ["threadMgr", "AnacondaThread", "ThreadManager"]