Merge branch 'master' of https://github.com/PTCInc/Kepware-ConfigAPI-SDK-Python

Author: rlabbeptc

kepconfig/__init__.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 from . import connection, error
 

kepconfig/connection.py

@@ -441,10 +441,10 @@ def __connect(self,request_obj):
         except error.HTTPError as err:
             payload = json.loads(codecs.decode(err.read(),'utf-8-sig'))
             # print('HTTP Code: {}\n{}'.format(err.code,payload), file=sys.stderr)
-            raise KepHTTPError(err.url, err.code, err.msg, err.hdrs, payload)
+            raise KepHTTPError(url=err.url, code=err.code, msg=err.msg, hdrs=err.hdrs, payload=payload)
         except error.URLError as err:
             # print('URLError: {} URL: {}'.format(err.reason, request_obj.get_full_url()), file=sys.stderr)
-            raise KepURLError(err.reason, request_obj.get_full_url())
+            raise KepURLError(msg=err.reason, url=request_obj.get_full_url())
 
     # Fucntion used to ensure special characters are handled in the URL
     # Ex: Space will be turned to %20

kepconfig/error.py

@@ -6,7 +6,7 @@
 
 
 r"""`error` Exception classes raised by Kepconfig.
-Includes KepURLError and KepHTTPError
+Includes KepError, KepURLError and KepHTTPError
 """
 
 __all__ = ['KepError', 'KepURLError', 'KepHTTPError']
@@ -24,10 +24,13 @@ def __str__(self):
 class KepURLError(KepError):
     '''Exception class raised by Kepconfig that inherits responses from the urllib URLError exceptions.
     '''
-    def __init__(self, reason, url):
-        KepError.__init__(self)
-        self.reason = reason
+    def __init__(self, url=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.url = url
+    
+    @property
+    def reason(self):
+        return self.msg
 
     def __str__(self):
         return '<urlopen error %s>' % self.reason
@@ -39,8 +42,8 @@ class KepHTTPError(KepError):
     code, headers, and a body.  In some contexts,an application may want to 
     handle an exception like a regular response.
     '''
-    def __init__(self, url, code, msg, hdrs, payload):
-        KepError.__init__(self, msg)
+    def __init__(self, url=None, code=None, hdrs=None, payload=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.url = url
         self.code = code
         self.hdrs = hdrs

tests/admin_test.py

@@ -92,7 +92,7 @@ def complete(server):
 
 
 @pytest.fixture(scope="module")
-def server(kepware_server: list[kepconfig.connection.server, str]):
+def server(kepware_server):
     server = kepware_server[0]
     global server_type
     server_type = kepware_server[1]

tests/conftest.py

@@ -11,8 +11,8 @@
 
 @pytest.fixture(scope="module")
 def kepware_server():
-    # return [kepconfig.connection.server(host = 'localhost', port = 57412, user = 'Administrator', pw = '', https = False), 'TKS']
+    return [kepconfig.connection.server(host = 'localhost', port = 57412, user = 'Administrator', pw = '', https = False), 'TKS']
 
-    server = kepconfig.connection.server(host = '127.0.0.1', port = 57513, user = 'Administrator', pw = 'Kepware400400400', https = True)
-    server.SSL_trust_all_certs = True
-    return [server, 'TKE']
+    # server = kepconfig.connection.server(host = '127.0.0.1', port = 57513, user = 'Administrator', pw = 'Kepware400400400', https = True)
+    # server.SSL_trust_all_certs = True
+    # return [server, 'TKE']

tests/connectivity_test.py

@@ -59,7 +59,7 @@ def complete(server):
         HTTPErrorHandler(err)
 
 @pytest.fixture(scope="module")
-def server(kepware_server: list[kepconfig.connection.server, str]):
+def server(kepware_server):
     server = kepware_server[0]
     global server_type
     server_type = kepware_server[1]

tests/datalogger_test.py

@@ -171,7 +171,7 @@ def complete(server):
 		HTTPErrorHandler(err)	
 
 @pytest.fixture(scope="module")
-def server(kepware_server: list[kepconfig.connection.server, str]):
+def server(kepware_server):
     server = kepware_server[0]
     global server_type
     server_type = kepware_server[1]

tests/egd_test.py

@@ -137,7 +137,7 @@ def complete(server):
             HTTPErrorHandler(err)
 
 @pytest.fixture(scope="module")
-def server(kepware_server: list[kepconfig.connection.server, str]):
+def server(kepware_server):
     server = kepware_server[0]
     global server_type
     server_type = kepware_server[1]

tests/iot_gateway_test.py

@@ -91,7 +91,7 @@ def complete(server):
             HTTPErrorHandler(err)
 
 @pytest.fixture(scope="module")
-def server(kepware_server: list[kepconfig.connection.server, str]):
+def server(kepware_server):
     server = kepware_server[0]
     global server_type
     server_type = kepware_server[1]

tests/server_connection_test.py

@@ -54,7 +54,7 @@ def complete(server):
     pass
 
 @pytest.fixture(scope="module")
-def server(kepware_server: list[kepconfig.connection.server, str]):
+def server(kepware_server):
     server = kepware_server[0]
     global server_type
     server_type = kepware_server[1]