Refactor threading imports to centralize in core module and remove deprecated threading.py

mrvisscher · mrvisscher · commit 4a9cc620832d · 2025-10-26T09:40:39.000+01:00
diff --git a/activity_browser/actions/database/database_duplicate.py b/activity_browser/actions/database/database_duplicate.py
@@ -8,7 +8,7 @@
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.ui.icons import qicons
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 
 from .database_new import NewDatabaseDialog
 
diff --git a/activity_browser/actions/database/database_export_bw2package.py b/activity_browser/actions/database/database_export_bw2package.py
@@ -5,8 +5,9 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import widgets, threading
+from activity_browser.ui import widgets
 from activity_browser.bwutils import exporters
+from activity_browser.ui.core import threading
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/database/database_export_excel.py b/activity_browser/actions/database/database_export_excel.py
@@ -5,8 +5,9 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import widgets, threading
+from activity_browser.ui import widgets
 from activity_browser.bwutils import exporters
+from activity_browser.ui.core import threading
 
 
 log = getLogger(__name__)
diff --git a/activity_browser/actions/database/database_import_from_ecoinvent.py b/activity_browser/actions/database/database_import_from_ecoinvent.py
@@ -13,11 +13,12 @@
 from qtpy.QtCore import Signal, SignalInstance
 
 from activity_browser import application, signals
-from activity_browser.ui import widgets, icons, threading
+from activity_browser.ui import widgets, icons
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.bwutils.io.ecoinvent_importer import Ecoinvent7zImporter
 from activity_browser.bwutils.io.ecoinvent_lcia_importer import EcoinventLCIAImporter
 from activity_browser.mod.bw2io.migrations import ab_create_core_migrations
+from activity_browser.ui.core import threading
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/database/database_importer_bw2package.py b/activity_browser/actions/database/database_importer_bw2package.py
@@ -5,8 +5,9 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import icons, widgets, threading
+from activity_browser.ui import icons, widgets
 from activity_browser.bwutils.importers import ABPackage
+from activity_browser.ui.core import threading
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/database/database_importer_excel.py b/activity_browser/actions/database/database_importer_excel.py
@@ -7,8 +7,9 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import threading, widgets
+from activity_browser.ui import widgets
 from activity_browser.bwutils.importers import ABExcelImporter
+from activity_browser.ui.core import threading
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/method/importer/method_importer_bw2io.py b/activity_browser/actions/method/importer/method_importer_bw2io.py
@@ -5,8 +5,9 @@
 
 from activity_browser import application
 from activity_browser.actions.base import exception_dialogs
-from activity_browser.ui import icons, widgets, threading
+from activity_browser.ui import icons, widgets
 from activity_browser.bwutils.io.ecoinvent_lcia_importer import EcoinventLCIAImporter
+from activity_browser.ui.core import threading
 
 from .method_importer_ecoinvent import ExtractExcelThread, MethodImporterEcoinvent
 
diff --git a/activity_browser/actions/method/importer/method_importer_ecoinvent.py b/activity_browser/actions/method/importer/method_importer_ecoinvent.py
@@ -6,8 +6,9 @@
 from activity_browser import application
 from activity_browser.mod import bw2data as bd
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import icons, threading, widgets
+from activity_browser.ui import icons, widgets
 from activity_browser.bwutils.io.ecoinvent_lcia_importer import EcoinventLCIAImporter
+from activity_browser.ui.core import threading
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/migrations_install.py b/activity_browser/actions/migrations_install.py
@@ -2,8 +2,9 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import icons, threading
+from activity_browser.ui import icons
 from activity_browser.mod.bw2io.migrations import ab_create_core_migrations
+from activity_browser.ui.core import threading
 
 
 class MigrationsInstall(ABAction):
diff --git a/activity_browser/actions/project/project_create_template.py b/activity_browser/actions/project/project_create_template.py
@@ -9,7 +9,7 @@
 from activity_browser import application
 from activity_browser.mod import bw2data as bd
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/project/project_export.py b/activity_browser/actions/project/project_export.py
@@ -10,7 +10,7 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/project/project_import.py b/activity_browser/actions/project/project_import.py
@@ -11,7 +11,7 @@
 from activity_browser.mod import bw2data as bd
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.ui.icons import qicons
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/project/project_migrate25.py b/activity_browser/actions/project/project_migrate25.py
@@ -9,7 +9,7 @@
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.bwutils import AB_metadata
 from activity_browser.ui.icons import qicons
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 
 log = getLogger(__name__)
 
diff --git a/activity_browser/actions/project/project_new_remote.py b/activity_browser/actions/project/project_new_remote.py
@@ -6,7 +6,7 @@
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.mod.bw2io import remote
 from activity_browser.ui.icons import qicons
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 
 from .project_switch import ProjectSwitch
 
diff --git a/activity_browser/actions/project/project_new_template.py b/activity_browser/actions/project/project_new_template.py
@@ -7,7 +7,7 @@
 from activity_browser import application, utils
 from activity_browser.actions.base import ABAction, exception_dialogs
 
-from activity_browser.ui.threading import ABThread
+from activity_browser.ui.core.threading import ABThread
 from activity_browser.ui.icons import qicons
 
 log = getLogger(__name__)
diff --git a/activity_browser/actions/pyside_upgrade.py b/activity_browser/actions/pyside_upgrade.py
@@ -6,11 +6,13 @@
 
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
-from activity_browser.ui import threading, icons
+from activity_browser.ui import icons
 
 from qtpy import QtWidgets
 from qtpy.QtCore import Signal, SignalInstance
 
+from activity_browser.ui.core import threading
+
 
 class PysideUpgrade(ABAction):
     """
diff --git a/activity_browser/bwutils/metadata/loader.py b/activity_browser/bwutils/metadata/loader.py
@@ -12,7 +12,7 @@
 from qtpy import QtCore
 
 from activity_browser import signals, application
-from activity_browser.ui import threading
+from activity_browser.ui.core import threading
 
 from .metadata import MetaDataStore
 from .fields import secondary_types, primary, secondary
diff --git a/activity_browser/mod/peewee/__init__.py b/activity_browser/mod/peewee/__init__.py
@@ -4,7 +4,7 @@
 import threading
 
 from activity_browser.mod.patching import patch_superclass, patched
-from activity_browser.ui.threading import thread_local
+from activity_browser.ui.core.threading import thread_local
 
 
 @patch_superclass
diff --git a/activity_browser/mod/pyprind/progbar.py b/activity_browser/mod/pyprind/progbar.py
@@ -1,6 +1,6 @@
 from pyprind.progbar import *
 from activity_browser.mod.patching import patch_superclass, patched
-from activity_browser.ui.threading import thread_local
+from activity_browser.ui.core.threading import thread_local
 
 from qtpy.QtCore import QObject, SignalInstance, Signal
 
diff --git a/activity_browser/ui/core/threading.py b/activity_browser/ui/core/threading.py
diff --git a/activity_browser/ui/widgets/wizard_page.py b/activity_browser/ui/widgets/wizard_page.py
@@ -3,7 +3,7 @@
 
 if TYPE_CHECKING:
     from activity_browser.ui.widgets import ABWizard
-    from activity_browser.ui.threading import ABThread
+    from activity_browser.ui.core.threading import ABThread
 
 
 class ABWizardPage(QtWidgets.QWizardPage):
diff --git a/activity_browser/ui/wizards/db_export_wizard.py b/activity_browser/ui/wizards/db_export_wizard.py
