Migrate to Python 3

[collecty.git] / src / collecty / plugins / interface.py

diff --git a/src/collecty/plugins/interface.py b/src/collecty/plugins/interface.py
index 4ab5f01ac7e198817f2da4f4385e8c9544090252..eeb8be6737d792ca77f6ca726813f6684759836c 100644 (file)
--- a/src/collecty/plugins/interface.py
+++ b/src/collecty/plugins/interface.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # collecty - A system statistics collection daemon for IPFire                 #
@@ -19,11 +19,11 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
+
 
 import os
 
-import base
+from . import base
 
 from ..i18n import _
 
@@ -34,7 +34,13 @@ COLOUR_RX_AREA = "%sAA" % COLOUR_RX
 COLOUR_TX = "228B22"
 COLOUR_TX_AREA = "%sAA" % COLOUR_TX
 
-class GraphTemplateInterfaceBits(base.GraphTemplate):
+class GraphTemplateInterfaceBase(base.GraphTemplate):
+       @property
+       def interface(self):
+               return self.object.interface
+
+
+class GraphTemplateInterfaceBits(GraphTemplateInterfaceBase):
        name = "interface-bits"
 
        @property
@@ -82,14 +88,15 @@ class GraphTemplateInterfaceBits(base.GraphTemplate):
                ]
 
        @property
-       def rrd_graph_args(self):
-               return [
-                       "--title", _("Bandwidth usage on %(interface)s"),
-                       "--vertical-label", _("Bit/s"),
-               ]
+       def graph_title(self):
+               return _("Bandwidth usage on %s") % self.interface
+
+       @property
+       def graph_vertical_label(self):
+               return _("Bit/s")
 
 
-class GraphTemplateInterfacePackets(base.GraphTemplate):
+class GraphTemplateInterfacePackets(GraphTemplateInterfaceBase):
        name = "interface-packets"
 
        @property
@@ -122,14 +129,15 @@ class GraphTemplateInterfacePackets(base.GraphTemplate):
                ]
 
        @property
-       def rrd_graph_args(self):
-               return [
-                       "--title", _("Transferred packets on %(interface)s"),
-                       "--vertical-label", _("Packets/s"),
-               ]
+       def graph_title(self):
+               return _("Transferred packets on %s") % self.interface
+
+       @property
+       def graph_vertical_label(self):
+               return _("Packets/s")
 
 
-class GraphTemplateInterfaceErrors(base.GraphTemplate):
+class GraphTemplateInterfaceErrors(GraphTemplateInterfaceBase):
        name = "interface-errors"
 
        @property
@@ -190,11 +198,12 @@ class GraphTemplateInterfaceErrors(base.GraphTemplate):
                ]
 
        @property
-       def rrd_graph_args(self):
-               return [
-                       "--title", _("Errors/dropped packets on %(interface)s"),
-                       "--vertical-label", _("Packets/s"),
-               ]
+       def graph_title(self):
+               return _("Errors/dropped packets on %s") % self.interface
+
+       @property
+       def graph_vertical_label(self):
+               return _("Packets/s")
 
 
 class InterfaceObject(base.Object):
@@ -259,7 +268,7 @@ class InterfaceObject(base.Object):
                                if f:
                                        f.close()
 
-               return ":".join(ret)
+               return ret
 
 
 class InterfacePlugin(base.Plugin):