cinnamon-settings: Make imports consistent, instead of a mix of

absolute and relative throughout.

ref: 6d15343, 0344b11

Author: mtwebster

files/usr/bin/cinnamon-install-spice

@@ -7,8 +7,8 @@ import argparse
 import gi
 gi.require_version('Gtk', '3.0')
 
-sys.path.append('/usr/share/cinnamon/cinnamon-settings/bin')
-from Spices import Spice_Harvester
+sys.path.append('/usr/share/cinnamon/cinnamon-settings')
+from bin.Spices import Spice_Harvester
 
 USAGE_DESCRIPTION = 'Installs an applet, desklet, extension, or theme from a local folder. Rather than just doing a shallow copy, it will also install translations, schema files (if present) and update the metadata with a timestamp for version comparison.'
 USAGE_EPILOG = 'This script is designed for developers to test their work. It is recommended that everyone else continue to use cinnamon-settings to install their spices as this script has no safeguards in place to prevent malicious code.'

files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py

@@ -19,8 +19,7 @@
 from cme import util
 
 sys.path.insert(0, '/usr/share/cinnamon/cinnamon-settings')
-sys.path.insert(0, '/usr/share/cinnamon/cinnamon-settings/bin')
-import JsonSettingsWidgets
+from bin import JsonSettingsWidgets
 
 # i18n
 gettext.install("cinnamon", "/usr/share/locale")

files/usr/share/cinnamon/cinnamon-settings/bin/AddKeyboardLayout.py

@@ -12,7 +12,7 @@
 gi.require_version('Pango', '1.0')
 from gi.repository import GLib, Gio, Gtk, GObject, CinnamonDesktop, IBus, Pango
 
-from SettingsWidgets import Keybinding
+from bin.SettingsWidgets import Keybinding
 from xapp.SettingsWidgets import SettingsPage
 from xapp.GSettingsWidgets import PXGSettingsBackend, GSettingsSwitch
 

files/usr/share/cinnamon/cinnamon-settings/bin/ExtensionCore.py

@@ -15,7 +15,7 @@
 from gi.repository import Gio, Gtk, Gdk, GdkPixbuf, GLib
 
 from xapp.SettingsWidgets import SettingsPage, SettingsWidget, SettingsLabel
-from Spices import ThreadedTaskManager
+from bin.Spices import ThreadedTaskManager
 
 home = os.path.expanduser('~')
 

files/usr/share/cinnamon/cinnamon-settings/bin/InputSources.py

@@ -10,11 +10,11 @@
 gi.require_version('IBus', '1.0')
 from gi.repository import GLib, Gio, Gtk, GObject, CinnamonDesktop, IBus
 
-from SettingsWidgets import GSettingsKeybinding
+from bin.SettingsWidgets import GSettingsKeybinding
 from xapp.SettingsWidgets import SettingsPage
 from xapp.GSettingsWidgets import PXGSettingsBackend, GSettingsSwitch
 
-import AddKeyboardLayout
+from bin import AddKeyboardLayout
 
 MAX_LAYOUTS_PER_GROUP = 4
 

files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py

@@ -2,10 +2,10 @@
 
 from gi.repository import Gio
 from xapp.SettingsWidgets import *
-from SettingsWidgets import SoundFileChooser, DateChooser, TimeChooser, Keybinding
+from bin.SettingsWidgets import SoundFileChooser, DateChooser, TimeChooser, Keybinding
 from xapp.GSettingsWidgets import CAN_BACKEND as px_can_backend
-from SettingsWidgets import CAN_BACKEND as c_can_backend
-from TreeListWidgets import List
+from bin.SettingsWidgets import CAN_BACKEND as c_can_backend
+from bin.TreeListWidgets import List
 import os
 import collections
 import json

files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py

@@ -9,11 +9,11 @@
 
 from xapp.SettingsWidgets import SettingsWidget, SettingsLabel
 from xapp.GSettingsWidgets import PXGSettingsBackend
-from ChooserButtonWidgets import DateChooserButton, TimeChooserButton
-from KeybindingWidgets import ButtonKeybinding
+from bin.ChooserButtonWidgets import DateChooserButton, TimeChooserButton
+from bin.KeybindingWidgets import ButtonKeybinding
 from bin import util
 
-import KeybindingTable
+from bin import KeybindingTable
 
 settings_objects = {}
 

files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py

@@ -409,7 +409,7 @@ def _url_retrieve(self, url, outfd, reporthook, binary):
         # Like the one in urllib. Unlike urllib.retrieve url_retrieve
         # can be interrupted. KeyboardInterrupt exception is raised when
         # interrupted.
-        import proxygsettings
+        from bin import proxygsettings
         import requests
 
         count = 0

files/usr/share/cinnamon/cinnamon-settings/bin/TreeListWidgets.py

@@ -4,7 +4,7 @@
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 from xapp.SettingsWidgets import *
-from SettingsWidgets import SoundFileChooser, Keybinding
+from bin.SettingsWidgets import SoundFileChooser, Keybinding
 
 VARIABLE_TYPE_MAP = {
     "string"        :   str,

files/usr/share/cinnamon/cinnamon-settings/bin/test-add-layout

@@ -1,6 +1,10 @@
 #!/usr/bin/python3
 
-import AddKeyboardLayout
+import os
+import sys
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from bin import AddKeyboardLayout
 import gettext
 
 if __name__ == "__main__":