From c24e2f9cadba7b64f7b347b92b4041b8eb981209 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 7 Apr 2021 16:55:52 +0200
Subject: [PATCH] Rename src -> util

---
 devices/HW_device_template.py              | 2 +-
 devices/PCC.py                             | 6 +++---
 devices/SDP.py                             | 6 +++---
 devices/clients/opcua_connection.py        | 2 +-
 devices/clients/test_client.py             | 2 +-
 devices/test_device.py                     | 4 ++--
 devices/{src => util}/attribute_wrapper.py | 2 +-
 devices/{src => util}/comms_client.py      | 0
 devices/{src => util}/hardware_device.py   | 6 +++---
 devices/{src => util}/lofar_logging.py     | 0
 devices/{src => util}/wrappers.py          | 0
 11 files changed, 15 insertions(+), 15 deletions(-)
 rename devices/{src => util}/attribute_wrapper.py (98%)
 rename devices/{src => util}/comms_client.py (100%)
 rename devices/{src => util}/hardware_device.py (97%)
 rename devices/{src => util}/lofar_logging.py (100%)
 rename devices/{src => util}/wrappers.py (100%)

diff --git a/devices/HW_device_template.py b/devices/HW_device_template.py
index c9365b496..6eec04be9 100644
--- a/devices/HW_device_template.py
+++ b/devices/HW_device_template.py
@@ -15,7 +15,7 @@
 from tango.server import run
 # Additional import
 
-from src.hardware_device import *
+from util.hardware_device import *
 
 
 __all__ = ["HW_dev"]
diff --git a/devices/PCC.py b/devices/PCC.py
index 753b06285..764be89ad 100644
--- a/devices/PCC.py
+++ b/devices/PCC.py
@@ -18,9 +18,9 @@ from tango.server import device_property
 
 # Additional import
 from clients.opcua_connection import OPCUAConnection
-from src.attribute_wrapper import *
-from src.hardware_device import *
-from src.lofar_logging import device_logging_to_python
+from util.attribute_wrapper import *
+from util.hardware_device import *
+from util.lofar_logging import device_logging_to_python
 
 
 __all__ = ["PCC", "main"]
diff --git a/devices/SDP.py b/devices/SDP.py
index 10a1d8a55..30672a7eb 100644
--- a/devices/SDP.py
+++ b/devices/SDP.py
@@ -17,9 +17,9 @@ from tango.server import device_property
 # Additional import
 
 from clients.opcua_connection import OPCUAConnection
-from src.attribute_wrapper import *
-from src.hardware_device import *
-from src.lofar_logging import device_logging_to_python
+from util.attribute_wrapper import *
+from util.hardware_device import *
+from util.lofar_logging import device_logging_to_python
 
 
 __all__ = ["SDP", "main"]
diff --git a/devices/clients/opcua_connection.py b/devices/clients/opcua_connection.py
index 676b24c65..f4c52a3ad 100644
--- a/devices/clients/opcua_connection.py
+++ b/devices/clients/opcua_connection.py
@@ -1,4 +1,4 @@
-from src.comms_client import *
+from util.comms_client import *
 import opcua
 
 __all__ = ["OPCUAConnection"]
diff --git a/devices/clients/test_client.py b/devices/clients/test_client.py
index 662bd692b..4575f3054 100644
--- a/devices/clients/test_client.py
+++ b/devices/clients/test_client.py
@@ -1,4 +1,4 @@
-from src.comms_client import *
+from util.comms_client import *
 
 # <class 'numpy.bool_'>
 
diff --git a/devices/test_device.py b/devices/test_device.py
index ea7c33351..857baf425 100644
--- a/devices/test_device.py
+++ b/devices/test_device.py
@@ -18,8 +18,8 @@ from tango import DevState
 # Additional import
 
 from clients.test_client import example_client
-from src.attribute_wrapper import *
-from src.hardware_device import *
+from util.attribute_wrapper import *
+from util.hardware_device import *
 
 __all__ = ["test_device", "main"]
 
diff --git a/devices/src/attribute_wrapper.py b/devices/util/attribute_wrapper.py
similarity index 98%
rename from devices/src/attribute_wrapper.py
rename to devices/util/attribute_wrapper.py
index bdf457df4..a303cfddb 100644
--- a/devices/src/attribute_wrapper.py
+++ b/devices/util/attribute_wrapper.py
@@ -3,7 +3,7 @@ from tango import AttrWriteType
 
 import numpy
 
-from src.wrappers import only_when_on, fault_on_error
+from util.wrappers import only_when_on, fault_on_error
 import logging
 logger = logging.getLogger()
 
diff --git a/devices/src/comms_client.py b/devices/util/comms_client.py
similarity index 100%
rename from devices/src/comms_client.py
rename to devices/util/comms_client.py
diff --git a/devices/src/hardware_device.py b/devices/util/hardware_device.py
similarity index 97%
rename from devices/src/hardware_device.py
rename to devices/util/hardware_device.py
index a65f91287..9933c1cb8 100644
--- a/devices/src/hardware_device.py
+++ b/devices/util/hardware_device.py
@@ -16,13 +16,13 @@ from tango.server import Device, command
 from tango import DevState, DebugIt
 # Additional import
 
-from src.attribute_wrapper import *
-from src.lofar_logging import log_exceptions
+from util.attribute_wrapper import *
+from util.lofar_logging import log_exceptions
 
 
 __all__ = ["hardware_device"]
 
-from src.wrappers import only_in_states
+from util.wrappers import only_in_states
 
 
 class hardware_device(Device):
diff --git a/devices/src/lofar_logging.py b/devices/util/lofar_logging.py
similarity index 100%
rename from devices/src/lofar_logging.py
rename to devices/util/lofar_logging.py
diff --git a/devices/src/wrappers.py b/devices/util/wrappers.py
similarity index 100%
rename from devices/src/wrappers.py
rename to devices/util/wrappers.py
-- 
GitLab