fix compatibility with older python version

rlehfeld · Apr 22, 2024 · 208314d · 208314d
1 parent b922087
commit 208314d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 24 deletions.
diff --git a/RPyCRobotRemote/RPyCRobotRemoteClient.py b/RPyCRobotRemote/RPyCRobotRemoteClient.py
@@ -61,26 +61,34 @@ def __init__(self,
                  **rpyc_config):
         self._keywords_cache = None
 
-        if timeout is not None:
-            timeout = convert_time(
-                timeout,
-                result_format='number'
-            )
-
         if logger is None:
             logger = logging.getLogger('RPyCRobotRemote.Client')
 
-        self._client = rpyc.connect(
-            peer,
-            port,
-            config=rpyc_config | {
+        config = {}
+        if rpyc_config:
+            config.update(rpyc_config)
+
+        config.update(
+            {
                 'allow_all_attrs': True,
                 'allow_getattr': True,
                 'allow_setattr': True,
                 'allow_delattr': True,
                 'allow_exposed_attrs': False,
                 'logger': logger,
-            } | ({} if timeout is None else {'sync_request_timeout': timeout}),
+            }
+        )
+
+        if timeout is not None:
+            config['sync_request_timeout'] =  convert_time(
+                timeout,
+                result_format='number'
+            )
+
+        self._client = rpyc.connect(
+            peer,
+            port,
+            config=config,
             ipv6=ipv6,
             keepalive=True,
         )

diff --git a/RPyCRobotRemote/RPyCRobotRemoteServer.py b/RPyCRobotRemote/RPyCRobotRemoteServer.py
@@ -111,32 +111,41 @@ def _rpyc_setattr(self, name: str, value):
             else pathlib.Path(port_file).absolute()
         )
 
-        if timeout is not None:
-            timeout = convert_time(
-                timeout,
-                result_format='number'
-            )
-
         if logger is None:
             logger = logging.getLogger('RPyCRobotRemote.Server')
 
         if server is None:
             server = ThreadedServer
 
+        config = {}
+        if rpyc_config:
+            config.update(rpyc_config)
+
+        config.update(
+            {
+                'allow_all_attrs': True,
+                'allow_getattr': True,
+                'allow_setattr': True,
+                'allow_delattr': True,
+                'allow_exposed_attrs': False,
+                'logger': logger,
+            }
+        )
+
+        if timeout is not None:
+            config['sync_request_timeout'] =  convert_time(
+                timeout,
+                result_format='number'
+            )
+
         self._server = server(
             Service(library),
             hostname=host,
             port=port,
             ipv6=ipv6,
             auto_register=False,
             logger=logger,
-            protocol_config=rpyc_config | {
-                'allow_all_attrs': True,
-                'allow_getattr': True,
-                'allow_setattr': True,
-                'allow_delattr': True,
-                'allow_exposed_attrs': False,
-            } | ({} if timeout is None else {'sync_request_timeout': timeout})
+            protocol_config=config,
         )
 
         if serve: