# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1554964817 -7200
# Node ID f8c66edffbd4e7f843af0038b6d814f63270d7df
# Parent  25f19b76c7b6c20a85be5b172bc6890e494ab62c# Parent  d94d4f396bbf40ff39244c2842d9799c92692eb9
merged

diff -r d94d4f396bbf -r f8c66edffbd4 connectors/PYRO/PSK_Adapter.py
--- a/connectors/PYRO/PSK_Adapter.py	Wed Apr 10 14:11:52 2019 +0200
+++ b/connectors/PYRO/PSK_Adapter.py	Thu Apr 11 08:40:17 2019 +0200
@@ -34,13 +34,17 @@
 import socket
 import re
 import ssl
-import sslpsk
 import Pyro
 from Pyro.core import PyroURI
 from Pyro.protocol import _connect_socket, TCPConnection, PYROAdapter
 from Pyro.errors import ConnectionDeniedError, ProtocolError
 from Pyro.util import Log
 
+try:
+    import sslpsk
+except ImportError as e:
+    print(str(e))
+    sslpsk = None
 
 class PYROPSKAdapter(PYROAdapter):
     """
@@ -126,5 +130,8 @@
     This function should be called after
     reimport of Pyro module to enable PYROS:// again.
     """
-    Pyro.protocol.getProtocolAdapter = getProtocolAdapter
-    Pyro.core.processStringURI = processStringURI
+    if sslpsk is not None:
+        Pyro.protocol.getProtocolAdapter = getProtocolAdapter
+        Pyro.core.processStringURI = processStringURI
+    else:
+        raise Exception("sslpsk python module unavailable")
diff -r d94d4f396bbf -r f8c66edffbd4 connectors/PYRO/__init__.py
--- a/connectors/PYRO/__init__.py	Wed Apr 10 14:11:52 2019 +0200
+++ b/connectors/PYRO/__init__.py	Thu Apr 11 08:40:17 2019 +0200
@@ -37,7 +37,7 @@
 from Pyro.errors import PyroError
 
 import PSKManagement as PSK
-import connectors.PYRO.PSK_Adapter
+from connectors.PYRO.PSK_Adapter import setupPSKAdapter
 from runtime import PlcStatus
 
 
@@ -49,7 +49,7 @@
     # Pyro.config.PYRO_BROKEN_MSGWAITALL = use_ssl
     reload(Pyro.protocol)
     if use_ssl:
-        connectors.PYRO.PSK_Adapter.setupPSKAdapter()
+        setupPSKAdapter()
 
 
 def PYRO_connector_factory(uri, confnodesroot):