Finish removing 'concurrency' and fix some subtle bugs

Author: Monarda

examples/basic_server_from_yaml.py

@@ -1,17 +1,10 @@
 # Run interactively to have the server stay up and then terminate using server.stop()
-import time
-
-from p4pillon import concurrency, config_reader
-
-if concurrency == "thread":
-    from p4pillon.thread.server import Server
-elif concurrency == "asyncio":
-    from p4pillon.asyncio.server import Server
-else:
-    raise ValueError(f"Unknown value for concurrency: {concurrency}")
-
 # Uncomment the lines below to turn on debugging output to the screen
 import logging
+import time
+
+from p4pillon import config_reader
+from p4pillon.thread.server import Server
 
 logging.getLogger().setLevel(logging.DEBUG)
 logging.getLogger().addHandler(logging.StreamHandler())

p4pillon/asyncio/pvrecipe.py

@@ -1 +1,8 @@
-from ..pvrecipe import *  # noqa: F403
+from typing import TypeVar
+
+from p4pillon.pvrecipe import *  # noqa: F403
+from p4pillon.server.thread import SharedPV as _SharedPV
+
+SharedPV = _SharedPV
+
+SharedPvT = TypeVar("SharedPvT", bound=_SharedPV)

p4pillon/asyncio/sharednt.py

@@ -1,5 +1,5 @@
-from p4pillon.sharednt import SharedNT # noqa: I001
+from p4pillon.sharednt import SharedNT  # noqa: I001
 
-from p4pillon.server.thread import SharedPV as _SharedPV
+from p4pillon.server.asyncio import SharedPV as _SharedPV
 
 SharedNT.SharedPV = _SharedPV

p4pillon/server/server.py

@@ -9,9 +9,9 @@
 from p4p.client.raw import Context
 from p4p.server import Server as _Server
 from p4p.server import StaticProvider
-from p4p.server.raw import SharedPV
 
 from p4pillon.pvrecipe import BasePVRecipe
+from p4pillon.server.raw import SharedPV
 
 logger = logging.getLogger(__name__)
 

p4pillon/thread/pvrecipe.py

@@ -1,8 +1,7 @@
 from typing import TypeVar
 
-from p4p.server.thread import SharedPV as _SharedPV
-
 from p4pillon.pvrecipe import *  # noqa: F403
+from p4pillon.server.thread import SharedPV as _SharedPV
 
 SharedPV = _SharedPV
 

p4pillon/thread/sharednt.py

@@ -1,4 +1,4 @@
-from p4pillon.sharednt import SharedNT # noqa: I001
+from p4pillon.sharednt import SharedNT  # noqa: I001
 
 from p4pillon.server.thread import SharedPV as _SharedPV