From aa22770436d16f428d90e21182b2e4ba9ba737ab Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 25 Mar 2025 07:14:35 -0400 Subject: [PATCH] Attempt to fix broken imports. --- src/cthulhu/cthulhuVersion.py | 2 +- src/cthulhu/plugin_system_manager.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/cthulhu/cthulhuVersion.py b/src/cthulhu/cthulhuVersion.py index 6bf1831..07ebed7 100644 --- a/src/cthulhu/cthulhuVersion.py +++ b/src/cthulhu/cthulhuVersion.py @@ -23,5 +23,5 @@ # Fork of Orca Screen Reader (GNOME) # Original source: https://gitlab.gnome.org/GNOME/orca -version = "2024.12.23" +version = "2025.03.25" codeName = "testing" diff --git a/src/cthulhu/plugin_system_manager.py b/src/cthulhu/plugin_system_manager.py index 48af6da..a5555d1 100644 --- a/src/cthulhu/plugin_system_manager.py +++ b/src/cthulhu/plugin_system_manager.py @@ -25,23 +25,25 @@ """PluginManager for loading cthulhu plugins.""" import os, inspect, sys, tarfile, shutil - from enum import IntEnum - version = sys.version[:3] # we only need major.minor version. if version in ["3.3","3.4"]: from importlib.machinery import SourceFileLoader else: # Python 3.5+, no support for python < 3.3. import importlib.util - import gi + +# First try the newer version, then fall back to older version if needed +try: + gi.require_version('GIRepository', '3.0') +except ValueError: + gi.require_version('GIRepository', '2.0') + gi.require_version('Peas', '1.0') from gi.repository import GObject from gi.repository import Peas - -gi.require_version('Atspi', '2.0') +gi.require_version('Atspi', '2.0') from gi.repository import Atspi - from cthulhu import resource_manager class API(GObject.GObject):