From 617373574a74e9f5013447494ae05e6b8f49de7c Mon Sep 17 00:00:00 2001
From: Sven Sager <akira@narux.de>
Date: Thu, 16 Feb 2023 13:09:04 +0100
Subject: [PATCH] Bugfix of imports and wordorder for revpi commander

---
 src/revpipyload/procimgserver.py | 3 +--
 src/revpipyload/revpipyload.py   | 6 +++---
 src/revpipyload/testsystem.py    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/revpipyload/procimgserver.py b/src/revpipyload/procimgserver.py
index 4df4824..5a53b55 100644
--- a/src/revpipyload/procimgserver.py
+++ b/src/revpipyload/procimgserver.py
@@ -13,7 +13,6 @@ import pickle
 from xmlrpc.client import Binary
 
 import revpimodio2
-from revpimodio2.io import StructIO
 
 from . import proginit
 
@@ -92,7 +91,7 @@ class ProcimgServer:
                     io._bitaddress,
                     io._byteorder,
                     io._signed,
-                    io.wordorder if issubclass(io, StructIO) else "ignored"
+                    getattr(io, "wordorder", "ignored"),
                 ])
         return Binary(pickle.dumps(dict_ios))
 
diff --git a/src/revpipyload/revpipyload.py b/src/revpipyload/revpipyload.py
index b7da4a7..7faca86 100644
--- a/src/revpipyload/revpipyload.py
+++ b/src/revpipyload/revpipyload.py
@@ -417,7 +417,7 @@ class RevPiPyLoad:
 
             # Erweiterte Funktionen anmelden
             try:
-                import procimgserver
+                from . import procimgserver
             except Exception:
                 self.xml_ps = None
                 proginit.logger.warning(
@@ -496,7 +496,7 @@ class RevPiPyLoad:
         th_plc = None
         if self.mqtt:
             try:
-                from mqttserver import MqttServer
+                from .mqttserver import MqttServer
             except Exception:
                 proginit.logger.warning(
                     "can not load revpimodio2 module. maybe its not installed "
@@ -1463,7 +1463,7 @@ def main() -> int:
     proginit.configure()
 
     if proginit.pargs.test:
-        from testsystem import TestSystem
+        from .testsystem import TestSystem
 
         root = TestSystem()
     else:
diff --git a/src/revpipyload/testsystem.py b/src/revpipyload/testsystem.py
index 93e4fe7..4f275dc 100644
--- a/src/revpipyload/testsystem.py
+++ b/src/revpipyload/testsystem.py
@@ -6,7 +6,7 @@ __license__ = "GPLv2"
 
 from configparser import ConfigParser
 
-import proginit
+from . import proginit
 
 newline = "\n------------------------------------------------------------\n"