Revert "Import examples direct."

This reverts commit db983b0.
pymodbus-dev · Nov 6, 2024 · d0cc7cc · d0cc7cc
1 parent 8001e1a
commit d0cc7cc
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 12 deletions.
diff --git a/examples/client_async.py b/examples/client_async.py
@@ -34,7 +34,7 @@
 
 
 try:
-    import helper  # type: ignore[import-not-found]
+    from examples import helper
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/client_async_calls.py b/examples/client_async_calls.py
@@ -38,7 +38,7 @@
 
 
 try:
-    import client_async  # type: ignore[import-not-found]
+    from examples import client_async
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/client_calls.py b/examples/client_calls.py
@@ -36,7 +36,7 @@
 
 
 try:
-    import client_sync  # type: ignore[import-not-found]
+    from examples import client_sync
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/client_payload.py b/examples/client_payload.py
@@ -12,7 +12,7 @@
 
 
 try:
-    import client_async  # type: ignore[import-not-found]
+    from examples import client_async
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/client_sync.py b/examples/client_sync.py
@@ -37,7 +37,7 @@
 
 
 try:
-    import helper  # type: ignore[import-not-found]
+    from examples import helper
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/modbus_forwarder.py b/examples/modbus_forwarder.py
@@ -24,7 +24,7 @@
 
 
 try:
-    import helper  # type: ignore[import-not-found]
+    from examples import helper
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/py.typed b/examples/py.typed
diff --git a/examples/server_async.py b/examples/server_async.py
@@ -40,7 +40,7 @@
 
 
 try:
-    import helper  # type: ignore[import-not-found]
+    from examples import helper
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/server_callback.py b/examples/server_callback.py
@@ -10,7 +10,7 @@
 
 
 try:
-    import server_async  # type: ignore[import-not-found]
+    from examples import server_async
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/server_payload.py b/examples/server_payload.py
@@ -10,7 +10,7 @@
 
 
 try:
-    import server_async  # type: ignore[import-not-found]
+    from examples import server_async
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/server_sync.py b/examples/server_sync.py
@@ -39,8 +39,7 @@
 
 
 try:
-    import helper  # type: ignore[import-not-found]
-    import server_async  # type: ignore[import-not-found]
+    from examples import helper, server_async
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\

diff --git a/examples/server_updating.py b/examples/server_updating.py
@@ -37,7 +37,7 @@
 
 
 try:
-    import server_async  # type: ignore[import-not-found]
+    from examples import server_async
 except ImportError:
     print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
           https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\