dbus: Move bus domain into bus submodule

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/collecty/bus.py b/src/collecty/bus.py
index ef56e2ca5183079de12d32bf609a01e3e96fe5bd..d71de8cb4bee587a387e754db6e1d2a099b8c9b8 100644 (file)
--- a/src/collecty/bus.py
+++ b/src/collecty/bus.py
@@ -32,6 +32,8 @@ from .constants import *
 
 log = logging.getLogger("collecty.bus")
 
+DOMAIN = "org.ipfire.collecty1"
+
 class Bus(threading.Thread):
        def __init__(self, collecty):
                threading.Thread.__init__(self)
@@ -72,16 +74,16 @@ class Bus(threading.Thread):
 
 class GraphGenerator(dbus.service.Object):
        def __init__(self, collecty):
-               bus_name = dbus.service.BusName(BUS_DOMAIN, bus=dbus.SystemBus())
+               bus_name = dbus.service.BusName(DOMAIN, bus=dbus.SystemBus())
                dbus.service.Object.__init__(self, bus_name, "/%s" % self.__class__.__name__)
 
                self.collecty = collecty
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="s")
+       @dbus.service.method(DOMAIN, in_signature="s")
        def Backup(self, filename):
                self.collecty.backup(filename)
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
+       @dbus.service.method(DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
        def GenerateGraph(self, template_name, kwargs):
                """
                        Returns a graph generated from the given template and object.
@@ -94,14 +96,14 @@ class GraphGenerator(dbus.service.Object):
 
                return graph
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="a{sv}")
+       @dbus.service.method(DOMAIN, in_signature="", out_signature="a{sv}")
        def GraphInfo(self, template_name, kwargs):
                """
                        Returns a dictionary with information about the graph.
                """
                return self.collecty.graph_info(template_name, **kwargs)
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
+       @dbus.service.method(DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
        def LastUpdate(self, template_name, kwargs):
                """
                        Returns a graph generated from the given template and object.
@@ -114,13 +116,13 @@ class GraphGenerator(dbus.service.Object):
 
                return last_update
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="as")
+       @dbus.service.method(DOMAIN, in_signature="", out_signature="as")
        def ListTemplates(self):
                """
                        Returns a list of all available templates
                """
                return [t.name for t in self.collecty.templates]
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="s")
+       @dbus.service.method(DOMAIN, in_signature="", out_signature="s")
        def Version(self):
                return COLLECTY_VERSION

diff --git a/src/collecty/client.py b/src/collecty/client.py
index d0fb3c9ed958a618b535b8d26924cf45c67a5656..c0693b0bd2eecae77f50beba64cf6c21d79d89ed 100644 (file)
--- a/src/collecty/client.py
+++ b/src/collecty/client.py
@@ -26,14 +26,14 @@ import os
 import platform
 import sys
 
-from .constants import *
+from . import bus
 from .i18n import _
 
 class Collecty(object):
        def __init__(self):
                self.bus = dbus.SystemBus()
 
-               self.proxy = self.bus.get_object(BUS_DOMAIN, "/GraphGenerator")
+               self.proxy = self.bus.get_object(bus.DOMAIN, "/GraphGenerator")
 
        def backup(self, filename):
                """

diff --git a/src/collecty/constants.py b/src/collecty/constants.py
index 7fd13bed0bbb52e2d9964eeea118accb3c28afab..a12863015f766daa36d87a2a4eadcac3339d5b71 100644 (file)
--- a/src/collecty/constants.py
+++ b/src/collecty/constants.py
@@ -25,8 +25,6 @@ from .__version__ import *
 
 DATABASE_DIR = "/var/lib/collecty"
 
-BUS_DOMAIN = "org.ipfire.collecty1"
-
 DEFAULT_IMAGE_FORMAT = "SVG"
 DEFAULT_LOCALE = "en_GB.utf8"
 DEFAULT_TIMEZONE = "UTC"