Backed out changes for pre py3.8 compatibility

Author: rlabbeptc

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]