Tidy up imports of other modules

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

diff --git a/src/collecty/bus.py b/src/collecty/bus.py
index a2990d2cec9ce4a6bc60538b663c1062014df972..8ad28fc96d1a24d8569fa8d3e00270eb947c73cf 100644 (file)
--- a/src/collecty/bus.py
+++ b/src/collecty/bus.py
@@ -27,8 +27,8 @@ import gi.repository.GObject
 import logging
 import threading
 
-from .constants import *
 from .i18n import _
+from .constants import *
 
 log = logging.getLogger("collecty.bus")
 

diff --git a/src/collecty/plugins/conntrack.py b/src/collecty/plugins/conntrack.py
index 2e24585f449995d6c9d611b3e2c9d4f99bb0c725..8e4b058dfb2abec62ba57a5fe136b4daf6fb04aa 100644 (file)
--- a/src/collecty/plugins/conntrack.py
+++ b/src/collecty/plugins/conntrack.py
@@ -24,7 +24,6 @@ import os
 from . import base
 
 from ..colours import *
-from ..i18n import _
 
 CONNTRACK_FILE = "/proc/net/nf_conntrack"
 

diff --git a/src/collecty/plugins/contextswitches.py b/src/collecty/plugins/contextswitches.py
index 8242de018136624d0b6360d919ed1d0258ba9482..0031a74778e79b80ee10cecabbd55779e5c985c7 100644 (file)
--- a/src/collecty/plugins/contextswitches.py
+++ b/src/collecty/plugins/contextswitches.py
@@ -24,7 +24,6 @@ import re
 from . import base
 
 from ..colours import *
-from ..i18n import _
 
 class GraphTemplateContextSwitches(base.GraphTemplate):
        name = "context-switches"

diff --git a/src/collecty/plugins/cpufreq.py b/src/collecty/plugins/cpufreq.py
index c6108918d707bcbaad1ff9298a97631ffd2c9358..c2ce9b4816553edcd2646422c04a78ad5bab9f0c 100644 (file)
--- a/src/collecty/plugins/cpufreq.py
+++ b/src/collecty/plugins/cpufreq.py
@@ -24,8 +24,6 @@ import re
 
 from . import base
 
-from ..i18n import _
-
 class GraphTemplateCPUFreq(base.GraphTemplate):
        name = "cpufreq"
 

diff --git a/src/collecty/plugins/df.py b/src/collecty/plugins/df.py
index 46fc05783ea3eb45e5b16948750a4f3ec1557a0a..ae6a27fe6451140147bac0224ec78ac708153c92 100644 (file)
--- a/src/collecty/plugins/df.py
+++ b/src/collecty/plugins/df.py
@@ -19,14 +19,13 @@
 #                                                                             #
 ###############################################################################
 
-from collecty import _collecty
 import os
 
-from ..constants import *
-from ..colours import *
+from .. import _collecty
 from . import base
 
-from ..i18n import _
+from ..constants import *
+from ..colours import *
 
 class GraphTemplateDiskUsage(base.GraphTemplate):
        name = "disk-usage"

diff --git a/src/collecty/plugins/disk.py b/src/collecty/plugins/disk.py
index 8b66ceefaa736ec03ebc95bced8d9cd27bd1f1c4..79083ee5b4352cb7e92028e40eb2ca256b79178c 100644 (file)
--- a/src/collecty/plugins/disk.py
+++ b/src/collecty/plugins/disk.py
@@ -19,14 +19,13 @@
 #                                                                             #
 ###############################################################################
 
-from collecty import _collecty
 import os
 import re
 
+from .. import _collecty
 from . import base
 
 from ..colours import *
-from ..i18n import _
 
 class GraphTemplateDiskBadSectors(base.GraphTemplate):
        name = "disk-bad-sectors"

diff --git a/src/collecty/plugins/interface.py b/src/collecty/plugins/interface.py
index 8be11cbf4dab8f5108d6260415779c5d069d3bae..b1dfe34fa22358f3870b858c3880c3b7d0558662 100644 (file)
--- a/src/collecty/plugins/interface.py
+++ b/src/collecty/plugins/interface.py
@@ -21,11 +21,10 @@
 
 import os
 
-from . import base
 from .. import util
-from ..colours import *
+from . import base
 
-from ..i18n import _
+from ..colours import *
 
 class GraphTemplateInterfaceBase(base.GraphTemplate):
        @property

diff --git a/src/collecty/plugins/interrupts.py b/src/collecty/plugins/interrupts.py
index 54da1020f40481dc8fdce33a8a35d823247a48cf..b8cacd1e46d8cce544cfe5f45575575b48b6d605 100644 (file)
--- a/src/collecty/plugins/interrupts.py
+++ b/src/collecty/plugins/interrupts.py
@@ -24,7 +24,6 @@ import re
 from . import base
 
 from ..colours import *
-from ..i18n import _
 
 class GraphTemplateSystemInterrupts(base.GraphTemplate):
        name = "system-interrupts"

diff --git a/src/collecty/plugins/ipfrag.py b/src/collecty/plugins/ipfrag.py
index a70d8fb519b77e00d64451e428ec2436cc779c5e..6d605711da0643e7b2524dad519c2b2374bbd190 100644 (file)
--- a/src/collecty/plugins/ipfrag.py
+++ b/src/collecty/plugins/ipfrag.py
@@ -24,9 +24,8 @@ import os
 from .. import util
 from . import base
 
-from ..colours  import *
+from ..colours import *
 from ..constants import *
-from ..i18n import _
 
 class GraphTemplateIPv6Fragmentation(base.GraphTemplate):
        name = "ipv6-fragmentation"

diff --git a/src/collecty/plugins/latency.py b/src/collecty/plugins/latency.py
index a4be42e1d27f2be2440ea417a403ca7ea1aaf4f0..388413d93d0d5fc09de4088d26b1cb8bb7c479d9 100644 (file)
--- a/src/collecty/plugins/latency.py
+++ b/src/collecty/plugins/latency.py
@@ -21,11 +21,11 @@
 
 import socket
 
+from .. import _collecty
+from ..i18n import _
 from . import base
 
-from .. import _collecty
 from ..colours import *
-from ..i18n import _
 
 PING_HOSTS = [
        # gateway is a special name that is automatically

diff --git a/src/collecty/plugins/loadavg.py b/src/collecty/plugins/loadavg.py
index bf9cef2e09f14acdf1da38fc582262736ee9cb39..7e9aee25907f8e35c3c55d493acdbeae6e9602f9 100644 (file)
--- a/src/collecty/plugins/loadavg.py
+++ b/src/collecty/plugins/loadavg.py
@@ -24,7 +24,6 @@ import os
 from . import base
 
 from ..colours import *
-from ..i18n import _
 
 class GraphTemplateLoadAvg(base.GraphTemplate):
        name = "loadavg"

diff --git a/src/collecty/plugins/memory.py b/src/collecty/plugins/memory.py
index 65b56debe7d1b385b1fa5273df9d494591a2e786..01e4d66489e31de6abbd135462bca2789287ac5d 100644 (file)
--- a/src/collecty/plugins/memory.py
+++ b/src/collecty/plugins/memory.py
@@ -21,7 +21,6 @@
 
 from . import base
 
-from ..i18n import _
 from ..colours import *
 
 class GraphTemplateMemory(base.GraphTemplate):

diff --git a/src/collecty/plugins/processor.py b/src/collecty/plugins/processor.py
index 30039c3ef34631cc1df1a241060946d7861d39f3..bf37b75ee1ede8a99b13477679f7ba4ca9045666 100644 (file)
--- a/src/collecty/plugins/processor.py
+++ b/src/collecty/plugins/processor.py
@@ -22,7 +22,6 @@
 from . import base
 
 from ..colours import *
-from ..i18n import _
 
 class GraphTemplateProcessor(base.GraphTemplate):
        name = "processor"

diff --git a/src/collecty/plugins/sensors.py b/src/collecty/plugins/sensors.py
index 56acca40592de69a2441c942e45a969147a2817f..e0d4d7eef98dd1589dfa36ac6866726b4748f3b1 100644 (file)
--- a/src/collecty/plugins/sensors.py
+++ b/src/collecty/plugins/sensors.py
@@ -20,14 +20,12 @@
 #                                                                             #
 ###############################################################################
 
-from collecty import _collecty
 import os
 import re
 
+from .. import _collecty
 from . import base
 
-from ..i18n import _
-
 class GraphTemplateSensorsTemperature(base.GraphTemplate):
        name = "sensors-temperature"