From e7c8c5f9583fe7b0b01b63f43e5a5daa3de842e8 Mon Sep 17 00:00:00 2001
From: NaruX <akira@narux.de>
Date: Sat, 17 Aug 2019 20:36:43 +0200
Subject: [PATCH] export_replaced_ios mit Dateinamen als default versehen
 (PyLoad name) Merge-Fehler beseitigt

---
 doc/revpimodio2.modio.html | 2 +-
 eric-revpimodio2.api       | 2 +-
 revpimodio2/modio.py       | 2 +-
 revpimodio2/netio.py       | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/revpimodio2.modio.html b/doc/revpimodio2.modio.html
index 4fef3d2..8d26ae8 100644
--- a/doc/revpimodio2.modio.html
+++ b/doc/revpimodio2.modio.html
@@ -505,7 +505,7 @@ Entfernt auch alle Devices aus autorefresh
 </dl><a NAME="RevPiModIO.export_replaced_ios" ID="RevPiModIO.export_replaced_ios"></a>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 RevPiModIO.export_replaced_ios</h3>
-<b>export_replaced_ios</b>(<i>filename</i>)
+<b>export_replaced_ios</b>(<i>filename="replace_ios.conf"</i>)
 <p>
 Exportiert ersetzte IOs dieser Instanz.
 </p><p>
diff --git a/eric-revpimodio2.api b/eric-revpimodio2.api
index e9edf68..c47caab 100644
--- a/eric-revpimodio2.api
+++ b/eric-revpimodio2.api
@@ -166,7 +166,7 @@ revpimodio2.modio.RevPiModIO.cycleloop?4(func, cycletime=50)
 revpimodio2.modio.RevPiModIO.cycletime?7
 revpimodio2.modio.RevPiModIO.debug?7
 revpimodio2.modio.RevPiModIO.exit?4(full=True)
-revpimodio2.modio.RevPiModIO.export_replaced_ios?4(filename)
+revpimodio2.modio.RevPiModIO.export_replaced_ios?4(filename="replace_ios.conf")
 revpimodio2.modio.RevPiModIO.get_jconfigrsc?4()
 revpimodio2.modio.RevPiModIO.handlesignalend?4(cleanupfunc=None)
 revpimodio2.modio.RevPiModIO.ioerrors?7
diff --git a/revpimodio2/modio.py b/revpimodio2/modio.py
index 0022721..e253807 100644
--- a/revpimodio2/modio.py
+++ b/revpimodio2/modio.py
@@ -687,7 +687,7 @@ class RevPiModIO(object):
                 if not self._monitoring:
                     self.writeprocimg(dev)
 
-    def export_replaced_ios(self, filename):
+    def export_replaced_ios(self, filename="replace_ios.conf"):
         """Exportiert ersetzte IOs dieser Instanz.
 
         Exportiert alle ersetzten IOs, welche mit .replace_io(...) angelegt
diff --git a/revpimodio2/netio.py b/revpimodio2/netio.py
index dee129f..7877825 100644
--- a/revpimodio2/netio.py
+++ b/revpimodio2/netio.py
@@ -380,7 +380,7 @@ class NetFH(Thread):
     def readreplaceio(self):
         """Ruft die replace_io Konfiguration ab.
         @return <class 'bytes'> replace_io_file"""
-        if self.__sockend:
+        if self.__sockend.is_set():
             raise ValueError("read of closed file")
 
         with self.__socklock:
@@ -388,21 +388,21 @@ class NetFH(Thread):
 
             byte_buff = bytearray()
             zero_byte = 0
-            while not self.__sockend and zero_byte < 100:
+            while not self.__sockend.is_set() and zero_byte < 100:
                 data = self._slavesock.recv(128)
                 if data == b'':
                     zero_byte += 1
 
                 byte_buff += data
                 if data.find(b'\x04') >= 0:
+                    self.__trigger = True
+
                     # NOTE: Nur suchen oder Ende prüfen?
                     return bytes(byte_buff[:-1])
 
             self.__sockerr.set()
             raise IOError("readreplaceio error on network")
 
-            self.__trigger = True
-
     def run(self):
         """Handler fuer Synchronisierung."""
         while not self.__sockend.is_set():