From f352cb63b6bdb1c29236a123275496e1878a9d29 Mon Sep 17 00:00:00 2001
From: Sven Sager <akira@narux.de>
Date: Wed, 1 Nov 2023 12:14:06 +0100
Subject: [PATCH] feat: Remove deprecated parameter 'direct_output' from ModIO
 classes

The RevPiModIO parameter 'direct_output' was replaced by
'shared_procimg' in the commit c11b435 from 2020-08-08. Users have
received a DepricatedWarning since then. With the upcoming version,
this parameter will be completely deleted.

Refs: c11b435
Signed-off-by: Sven Sager <akira@narux.de>
---
 src/revpimodio2/modio.py | 15 +--------------
 src/revpimodio2/netio.py |  7 -------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/revpimodio2/modio.py b/src/revpimodio2/modio.py
index 9eafcec..ef406c6 100644
--- a/src/revpimodio2/modio.py
+++ b/src/revpimodio2/modio.py
@@ -112,7 +112,6 @@ class RevPiModIO(object):
         debug=True,
         replace_io_file=None,
         shared_procimg=False,
-        direct_output=False,
     ):
         """
         Instantiiert die Grundfunktionen.
@@ -127,7 +126,6 @@ class RevPiModIO(object):
         :param replace_io_file: Replace IO Konfiguration aus Datei laden
         :param shared_procimg: Share process image with other processes, this
                                could be insecure for automation
-        :param direct_output: Deprecated, use shared_procimg
         """
         # Parameterprüfung
         acheck(
@@ -138,7 +136,6 @@ class RevPiModIO(object):
             simulator=simulator,
             debug=debug,
             shared_procimg=shared_procimg,
-            direct_output=direct_output,
         )
         acheck(
             str,
@@ -147,19 +144,13 @@ class RevPiModIO(object):
             replace_io_file_noneok=replace_io_file,
         )
 
-        # TODO: Remove in next release
-        if direct_output:
-            warnings.warn(
-                DeprecationWarning("direct_output is deprecated - use shared_procimg instead!")
-            )
-
         self._autorefresh = autorefresh
         self._configrsc = configrsc
         self._monitoring = monitoring
         self._procimg = "/dev/piControl0" if procimg is None else procimg
         self._set_device_based_cycle_time = True
         self._simulator = simulator
-        self._init_shared_procimg = shared_procimg or direct_output
+        self._init_shared_procimg = shared_procimg
         self._syncoutputs = syncoutputs
 
         # TODO: bei simulator und procimg prüfen ob datei existiert / anlegen?
@@ -1375,7 +1366,6 @@ class RevPiModIOSelected(RevPiModIO):
         debug=True,
         replace_io_file=None,
         shared_procimg=False,
-        direct_output=False,
     ):
         """
         Instantiiert nur fuer angegebene Devices die Grundfunktionen.
@@ -1397,7 +1387,6 @@ class RevPiModIOSelected(RevPiModIO):
             debug,
             replace_io_file,
             shared_procimg,
-            direct_output,
         )
 
         if type(deviceselection) is not DevSelect:
@@ -1453,7 +1442,6 @@ class RevPiModIODriver(RevPiModIOSelected):
         debug=True,
         replace_io_file=None,
         shared_procimg=False,
-        direct_output=False,
     ):
         """
         Instantiiert die Grundfunktionen.
@@ -1479,7 +1467,6 @@ class RevPiModIODriver(RevPiModIOSelected):
             debug,
             replace_io_file,
             shared_procimg,
-            direct_output,
         )
 
 
diff --git a/src/revpimodio2/netio.py b/src/revpimodio2/netio.py
index 2314ac7..69ccec1 100644
--- a/src/revpimodio2/netio.py
+++ b/src/revpimodio2/netio.py
@@ -714,7 +714,6 @@ class RevPiNetIO(_RevPiModIO):
         debug=True,
         replace_io_file=None,
         shared_procimg=False,
-        direct_output=False,
     ):
         """
         Instantiiert die Grundfunktionen.
@@ -728,7 +727,6 @@ class RevPiNetIO(_RevPiModIO):
         :param replace_io_file: Replace IO Konfiguration aus Datei laden
         :param shared_procimg: Share process image with other processes, this
                                could be insecure for automation
-        :param direct_output: Deprecated, use shared_procimg
         """
         check_ip = compile(r"^(25[0-5]|(2[0-4]|[01]?\d|)\d)(\.(25[0-5]|(2[0-4]|[01]?\d|)\d)){3}$")
 
@@ -771,7 +769,6 @@ class RevPiNetIO(_RevPiModIO):
             debug=debug,
             replace_io_file=replace_io_file,
             shared_procimg=shared_procimg,
-            direct_output=direct_output,
         )
         self._set_device_based_cycle_time = False
 
@@ -949,7 +946,6 @@ class RevPiNetIOSelected(RevPiNetIO):
         debug=True,
         replace_io_file=None,
         shared_procimg=False,
-        direct_output=False,
     ):
         """
         Instantiiert nur fuer angegebene Devices die Grundfunktionen.
@@ -971,7 +967,6 @@ class RevPiNetIOSelected(RevPiNetIO):
             debug,
             replace_io_file,
             shared_procimg,
-            direct_output,
         )
 
         if type(deviceselection) is not DevSelect:
@@ -1026,7 +1021,6 @@ class RevPiNetIODriver(RevPiNetIOSelected):
         debug=True,
         replace_io_file=None,
         shared_procimg=False,
-        direct_output=False,
     ):
         """
         Instantiiert die Grundfunktionen.
@@ -1052,7 +1046,6 @@ class RevPiNetIODriver(RevPiNetIOSelected):
             debug,
             replace_io_file,
             shared_procimg,
-            direct_output,
         )