Decouple the Gramps core from GObject

Author: bartfeenstra

gramps/gen/const.py

@@ -92,11 +92,43 @@
 APP_GENEWEB = "application/x-geneweb"
 APP_VCARD = ["text/x-vcard", "text/x-vcalendar"]
 
+
 # -------------------------------------------------------------------------
 #
 # Determine the user data and user configuration directories.
 #
 # -------------------------------------------------------------------------
+def _glib_get_home_dir() -> str:
+    return GLib.get_home_dir()
+
+
+def _glib_get_user_cache_dir() -> str:
+    if "XDG_CACHE_HOME" in os.environ and os.environ["XDG_CACHE_HOME"]:
+        return os.environ["XDG_CACHE_HOME"]
+    cache_dir = get_special_folder_internet_cache()
+    if cache_dir:
+        return cache_dir
+    return os.path.join(_glib_get_home_dir(), ".cache")
+
+
+def _glib_get_user_config_dir() -> str:
+    if "XDG_CONFIG_HOME" in os.environ and os.environ["XDG_CONFIG_HOME"]:
+        return os.environ["XDG_CONFIG_HOME"]
+    config_dir = get_special_folder_local_app_data()
+    if config_dir:
+        return config_dir
+    return os.path.join(_glib_get_home_dir(), ".config")
+
+
+def _glib_get_user_data_dir() -> str:
+    if "XDG_DATA_HOME" in os.environ and os.environ["XDG_DATA_HOME"]:
+        return os.environ["XDG_DATA_HOME"]
+    data_dir = get_special_folder_local_app_data()
+    if data_dir:
+        return data_dir
+    return os.path.join(_glib_get_home_dir(), ".local", "share")
+
+
 if "GRAMPSHOME" in os.environ:
     USER_HOME = get_env_var("GRAMPSHOME")
     USER_DATA = os.path.join(USER_HOME, "gramps")
@@ -117,8 +149,8 @@
             shutil.move(OLD_HOME, USER_DATA)
 else:
     USER_HOME = get_env_var("HOME")
-    USER_DATA = os.path.join(GLib.get_user_data_dir(), "gramps")
-    USER_CONFIG = os.path.join(GLib.get_user_config_dir(), "gramps")
+    USER_DATA = os.path.join(_glib_get_user_data_dir(), "gramps")
+    USER_CONFIG = os.path.join(_glib_get_user_config_dir(), "gramps")
     # Copy the database directory into the XDG directory.
     OLD_HOME = os.path.join(USER_HOME, ".gramps")
     if os.path.exists(OLD_HOME):
@@ -129,7 +161,7 @@
             if os.path.exists(db_dir):
                 shutil.copytree(db_dir, os.path.join(USER_DATA, "grampsdb"))
 
-USER_CACHE = os.path.join(GLib.get_user_cache_dir(), "gramps")
+USER_CACHE = os.path.join(_glib_get_user_cache_dir(), "gramps")
 
 if "SAFEMODE" in os.environ:
     USER_CONFIG = get_env_var("SAFEMODE")

gramps/gen/utils/requirements.py

@@ -25,13 +25,6 @@
 # -------------------------------------------------------------------------
 from importlib.util import find_spec
 
-# -------------------------------------------------------------------------
-#
-# GTK modules
-#
-# -------------------------------------------------------------------------
-import gi
-
 # -------------------------------------------------------------------------
 #
 # Gramps modules
@@ -90,9 +83,11 @@ def _test_gi(self, module, version):
         Test to see if a particular version of a module is available.
         """
         try:
+            import gi
+
             gi.require_version(module, version)
             return True
-        except ValueError:
+        except (ModuleNotFoundError, ValueError):
             return False
 
     def check_exe(self, executable):