]> git.ipfire.org Git - people/ms/westferry.git/commitdiff
ui/utils: Use backend module to determine the hostname
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Oct 2015 12:02:07 +0000 (14:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Oct 2015 12:02:07 +0000 (14:02 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/westferry/ui/base.py
src/westferry/ui/utils.py

index d888c1a4f39f63c7aceeeaeb6db281cfcd34def3..8d3317bcd7c982aea8f4eb38450b5e4996489ccf 100644 (file)
@@ -65,7 +65,19 @@ class UIModulesRegistration(type):
 class BaseUIMethod(object, metaclass=UIMethodsRegistration):
        handle = None
 
-       def __call__(self, *args, **kwargs):
+       @property
+       def backend(self):
+               """
+                       Shortcut to access the backend
+               """
+               return self.handler.backend
+
+       def __call__(self, handler, *args, **kwargs):
+               self.handler = handler
+
+               return self.call(*args, **kwargs)
+
+       def call(self, *args, **kwargs):
                raise NotImplementedError
 
 
index ea1be188382d63d76819bf7c746a27302fe12010..3751bbfb41ba7fb1fbff9f331f6698c59a10cb92 100644 (file)
@@ -19,8 +19,6 @@
 #                                                                             #
 ###############################################################################
 
-import socket
-
 from . import base
 
 class HostnameMethod(base.BaseUIMethod):
@@ -30,5 +28,5 @@ class HostnameMethod(base.BaseUIMethod):
 
        handle = "hostname"
 
-       def __call__(self, handler):
-               return socket.gethostname()
+       def call(self):
+               return self.backend.system.hostname