Smaller code cleanups like "adding var" since it is not already declared,...

Smaller code cleanups like "adding var" since it is not already declared, removing unused import statementes and similar.

asyncua/ua/uatypes.py

@@ -768,6 +768,7 @@ class Variant(FrozenClass):
         return not self.__eq__(other)
 
     def _guess_type(self, val):
+        error_val = None
         if isinstance(val, (list, tuple)):
             error_val = val
         while isinstance(val, (list, tuple)):

tests/conftest.py

@@ -5,7 +5,7 @@ import os
 import socket
 
 from collections import namedtuple
-from asyncua import ua, Client, Server
+from asyncua import Client
 from asyncua.client.ha.ha_client import HaClient, HaConfig, HaMode
 from asyncua.server.history import HistoryDict
 from asyncua.server.history_sql import HistorySQLite
@@ -17,7 +17,6 @@ from threading import Thread
 from asyncio import get_event_loop_policy, sleep
 from contextlib import closing
 
-import pytest
 from asyncua import Server, ua
 
 
@@ -398,6 +397,7 @@ async def wait_node_in_real_map(ha_client, sub, node_str, negation=False):
     reconciliator = ha_client.reconciliator
     for client in ha_client.get_clients():
         url = client.server_url.geturl()
+        vs = None
         for _ in range(RETRY):
             # virtual subscription must already exist,
             if reconciliator.real_map.get(url):
@@ -413,6 +413,7 @@ async def wait_mode_in_real_map(ha_client, client, sub, mode, value):
     await wait_sub_in_real_map(ha_client, sub)
     url = client.server_url.geturl()
     vsub = reconciliator.real_map[url][sub]
+    option = None
     for _ in range(RETRY):
         option = getattr(vsub, mode)
         if option == value:

tests/test_connections.py

 # coding: utf-8
-
-import asyncio
-
 import pytest
 
 from asyncua import Client

tests/test_ha_client.py

 import pytest
-
-from asyncio import Future, wait_for
 from itertools import chain
 
 from asyncua import ua, Client
@@ -135,6 +133,7 @@ class TestHaClient:
         # real map data are OK
         monitoring = {ua.MonitoringMode.Reporting, ua.MonitoringMode.Disabled}
         publishing = {True, False}
+        node_str = None
 
         for vsub in ha_client.reconciliator.real_map.values():
             vs = vsub[sub]
@@ -192,6 +191,7 @@ class TestHaClient:
 
         # real map data are OK
         reconciliator = ha_client.reconciliator
+        _url = None
         for _url, vsub in reconciliator.real_map.items():
             vs = vsub[sub]
             if vs.publishing:

tests/test_permissions.py

 import os
 import pytest
-import sys
 
 from asyncua import Client
 from asyncua import Server

tests/test_server.py

@@ -6,7 +6,7 @@ import asyncio
 import pytest
 import logging
 from datetime import timedelta
-from enum import Enum, EnumMeta
+from enum import EnumMeta
 
 import asyncua
 from asyncua import Server, Client, ua, uamethod
@@ -505,31 +505,31 @@ async def test_get_node_by_ns(server):
     # the tests
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces=[idx_a, idx_b, idx_c])
     assert 3 == len(nodes)
-    assert set([idx_a, idx_b, idx_c]) == get_ns_of_nodes(nodes)
+    assert {idx_a, idx_b, idx_c} == get_ns_of_nodes(nodes)
 
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces=[idx_a])
     assert 1 == len(nodes)
-    assert set([idx_a]) == get_ns_of_nodes(nodes)
+    assert {idx_a} == get_ns_of_nodes(nodes)
 
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces=[idx_b])
     assert 1 == len(nodes)
-    assert set([idx_b]) == get_ns_of_nodes(nodes)
+    assert {idx_b} == get_ns_of_nodes(nodes)
 
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces=['a'])
     assert 1 == len(nodes)
-    assert set([idx_a]) == get_ns_of_nodes(nodes)
+    assert {idx_a} == get_ns_of_nodes(nodes)
 
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces=['a', 'c'])
     assert 2 == len(nodes)
-    assert set([idx_a, idx_c]) == get_ns_of_nodes(nodes)
+    assert {idx_a, idx_c} == get_ns_of_nodes(nodes)
 
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces='b')
     assert 1 == len(nodes)
-    assert set([idx_b]) == get_ns_of_nodes(nodes)
+    assert {idx_b} == get_ns_of_nodes(nodes)
 
     nodes = await ua_utils.get_nodes_of_namespace(server, namespaces=idx_b)
     assert 1 == len(nodes)
-    assert set([idx_b]) == get_ns_of_nodes(nodes)
+    assert {idx_b} == get_ns_of_nodes(nodes)
     with pytest.raises(ValueError):
         await ua_utils.get_nodes_of_namespace(server, namespaces='non_existing_ns')
 

tests/test_standard_address_space.py

@@ -2,8 +2,6 @@ import pytest
 import os.path
 import xml.etree.ElementTree as ET
 
-import pytest
-
 from asyncua.server.address_space import AddressSpace
 from asyncua.server.address_space import NodeManagementService
 from asyncua.server.standard_address_space import standard_address_space

tests/test_tools.py

@@ -3,6 +3,7 @@ from unittest.mock import patch
 import sys
 import subprocess
 import concurrent.futures
+import signal
 
 from asyncua.tools import uaread, uals, uawrite, uahistoryread, uaclient, uadiscover, uacall
 
@@ -55,4 +56,4 @@ async def test_cli_tools_which_require_sigint(running_server):
         with pytest.raises(subprocess.TimeoutExpired):
             # we consider there's no error if the process is still alive
             proc.communicate(timeout=2)
-        proc.send_signal(subprocess.signal.SIGINT)
+        proc.send_signal(signal.SIGINT)

tests/test_xml.py

 import uuid
-import pytz
 import logging
 import datetime
 import pathlib
-
 import pytest
 
+from pytz import timezone
+
 from asyncua import ua, Node, uamethod
 from asyncua.ua import uaerrors
 
@@ -237,7 +237,7 @@ async def test_xml_datetime_array(opc, tmpdir):
     o = await opc.opc.nodes.objects.add_variable(3, "myxmlvar-array", [
         datetime.datetime.now(),
         datetime.datetime.utcnow(),
-        datetime.datetime.now(pytz.timezone("Asia/Tokyo"))
+        datetime.datetime.now(timezone("Asia/Tokyo"))
     ], ua.VariantType.DateTime)
     await _test_xml_var_type(opc, tmpdir, o, "datetime_array")
     await opc.opc.delete_nodes([o])

tools/uaserver

@@ -2,7 +2,6 @@
 
 import sys
 import os
-import asyncio
 import logging
 logging.basicConfig(level=logging.DEBUG)
 sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))