From 74759e8dfbfce5812cbd6afac77c4bfe5fdd918e Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Mon, 7 Aug 2017 12:20:46 -0700 Subject: Fix #492: Correctly import xdg modules Although not named like modules, the BaseDirectory and DesktopEntry are really submodules of xdg that need to be imported for them to be available. --- src/redshift-gtk/utils.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/redshift-gtk/utils.py b/src/redshift-gtk/utils.py index d74b567..9365356 100644 --- a/src/redshift-gtk/utils.py +++ b/src/redshift-gtk/utils.py @@ -22,9 +22,11 @@ import os import sys try: - import xdg + from xdg import BaseDirectory + from xdg import DesktopEntry + has_xdg = True except ImportError: - xdg = None + has_xdg = False REDSHIFT_DESKTOP = 'redshift-gtk.desktop' @@ -36,12 +38,12 @@ AUTOSTART_KEYS = (('Hidden', ('true', 'false')), def open_autostart_file(): - autostart_dir = xdg.BaseDirectory.save_config_path("autostart") + autostart_dir = BaseDirectory.save_config_path("autostart") autostart_file = os.path.join(autostart_dir, REDSHIFT_DESKTOP) if not os.path.exists(autostart_file): desktop_files = list( - xdg.BaseDirectory.load_data_paths( + BaseDirectory.load_data_paths( "applications", REDSHIFT_DESKTOP)) if not desktop_files: @@ -50,22 +52,22 @@ def open_autostart_file(): desktop_file_path = desktop_files[0] # Read installed file - dfile = xdg.DesktopEntry.DesktopEntry(desktop_file_path) + dfile = DesktopEntry.DesktopEntry(desktop_file_path) for key, values in AUTOSTART_KEYS: dfile.set(key, values[False]) dfile.write(filename=autostart_file) else: - dfile = xdg.DesktopEntry.DesktopEntry(autostart_file) + dfile = DesktopEntry.DesktopEntry(autostart_file) return dfile, autostart_file def supports_autostart(): - return xdg is not None + return has_xdg def get_autostart(): - if xdg is None: + if not has_xdg: return False dfile, path = open_autostart_file() @@ -74,7 +76,7 @@ def get_autostart(): def set_autostart(active): - if xdg is None: + if not has_xdg: return dfile, path = open_autostart_file() -- cgit v1.2.3-70-g09d2