2 files changed, 41 insertions, 16 deletions

diff --git a/examples/oecho.py b/examples/oecho.py
index d3fccfe..4bf3e05 100755
--- a/examples/oecho.py
+++ b/examples/oecho.py
@@ -35,28 +35,42 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ouroboros.dev import *
+"""A simple echo client/server example using Ouroboros flows."""
+
+# Standalone demo; intentionally duplicates oecho_set.py.
+# pylint: disable=duplicate-code
+
+from __future__ import annotations
+
 import argparse
 
+from ouroboros.dev import flow_accept, flow_alloc
+
 
-def client():
+def client() -> None:
+    """Send a message and print the echo reply."""
     with flow_alloc("oecho") as f:
         f.writeline("Hello, PyOuroboros!")
         print(f.readline())
 
 
-def server():
+def server() -> None:
+    """Accept flows and echo back received messages."""
     print("Starting the server.")
     while True:
         with flow_accept() as f:
             print("New flow.")
             line = f.readline()
-            print("Message from client is " + line)
+            print(f"Message from client is {line}")
             f.writeline(line)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='A simple echo client/server')
-    parser.add_argument('-l', '--listen', help='run as a server', action='store_true')
+    parser.add_argument('-l', '--listen', help='run as a server',
+                        action='store_true')
     args = parser.parse_args()
-    server() if args.listen is True else client()
+    if args.listen:
+        server()
+    else:
+        client()
diff --git a/examples/oecho_set.py b/examples/oecho_set.py
index a389cc3..72265df 100755
--- a/examples/oecho_set.py
+++ b/examples/oecho_set.py
@@ -35,37 +35,48 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ouroboros.event import *
+"""A simple echo client/server example using Ouroboros flow event sets."""
+
+# Standalone demo; intentionally duplicates oecho.py.
+# pylint: disable=duplicate-code
+
+from __future__ import annotations
+
 import argparse
 
+from ouroboros.dev import flow_accept, flow_alloc
+from ouroboros.event import FEventQueue, FEventType, FlowSet
+
 
-def client():
+def client() -> None:
+    """Send a message and print the echo reply."""
     with flow_alloc("oecho") as f:
         f.writeline("Hello, PyOuroboros!")
         print(f.readline())
 
 
-def server():
+def server() -> None:
+    """Accept flows and echo back received messages using flow events."""
     print("Starting the server.")
     while True:
         with flow_accept() as f:
             print("New flow.")
-            fq = FEventQueue()
-            with FlowSet([f]) as fs:
+            with FEventQueue() as fq, FlowSet([f]) as fs:
                 fs.wait(fq)
-            f2, t = fq.next()
-            if t != FEventType.FlowPkt:
+                f2, t = fq.next()
+            if t != FEventType.FLOW_PKT:
                 continue
             line = f2.readline()
-            print("Message from client is " + line)
+            print(f"Message from client is {line}")
             f2.writeline(line)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='A simple echo client/server')
-    parser.add_argument('-l', '--listen', help='run as a server', action='store_true')
+    parser.add_argument('-l', '--listen', help='run as a server',
+                        action='store_true')
     args = parser.parse_args()
-    if args.listen is True:
+    if args.listen:
         server()
     else:
         client()