make tests pass without too much sacrifice

Author: tshirtman

oscpy/server/__init__.py

@@ -363,7 +363,7 @@ def get_sender(self):
         """
         frames = inspect.getouterframes(inspect.currentframe())
         for frame, filename, _, function, _, _ in frames:
-            if function == 'handle_message' and __FILE__.startswith(filename):
+            if function == 'handle_message' and frame.f_locals.get('self') is self and 'sender_socket' in frame.f_locals:
                 break
         else:
             raise RuntimeError('get_sender() not called from a callback')
@@ -522,8 +522,9 @@ def _execute_callbacks(self, callbacks_list, address, values):
                     cb(*values)
             except Exception:
                 if self.intercept_errors:
-                    logger.exception("Unhandled exception caught in oscpy server")
+                    logger.exception("Ignoring unhandled exception caught in oscpy server")
                 else:
+                    logger.exception("Unhandled exception caught in oscpy server")
                     raise
 
     def handle_message(self, data, sender, sender_socket):

oscpy/server/asyncio_server.py

@@ -2,6 +2,7 @@
 import socket
 from functools import partial
 from logging import getLogger
+from typing import Awaitable
 
 from oscpy.server import OSCBaseServer
 
@@ -17,12 +18,22 @@ def __init__(self, *args, **kwargs):
 
     def listen(self, address='localhost', port=0, default=False, family='inet', **kwargs):
         loop = asyncio.get_event_loop()
+        if family == 'unix':
+            family_ = socket.AF_UNIX
+        elif family == 'inet':
+            family_ = socket.AF_INET
+        else:
+            raise ValueError(
+                "Unknown socket family, accepted values are 'unix' and 'inet'"
+            )
+
         if family == 'unix':
             addr = address
         else:
             addr = (address, port)
+
         sock = self.get_socket(
-            family=socket.AF_UNIX if family == 'unix' else socket.AF_INET,
+            family=family_,
             addr=addr,
         )
         self.listeners[(address, port or sock.getsockname()[1])] = loop.create_datagram_endpoint(
@@ -46,12 +57,16 @@ async def _execute_callbacks(self, callbacks_list, address, values):
         for cb, get_address in callbacks_list:
             try:
                 if get_address:
-                    await cb(address, *values)
+                    result = cb(address, *values)
                 else:
-                    await cb(*values)
+                    result = cb(*values)
+                if isinstance(result, Awaitable):
+                    await result
+            except asyncio.CancelledError:
+                ...
             except Exception:
                 if self.intercept_errors:
-                    logger.exception("Unhandled exception caught in oscpy server")
+                    logger.exception("Ignoring unhandled exception caught in oscpy server")
                 else:
                     raise
 

oscpy/server/curio_server.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Awaitable
 
 from curio import TaskGroup, socket
 from oscpy.server import OSCBaseServer, UDP_MAX_SIZE
@@ -43,12 +44,14 @@ async def _execute_callbacks(self, callbacks_list, address, values):
         for cb, get_address in callbacks_list:
             try:
                 if get_address:
-                    await cb(address, *values)
+                    result = cb(address, *values)
                 else:
-                    await cb(*values)
+                    result = cb(*values)
+                if isinstance(result, Awaitable):
+                    await result
             except Exception:
                 if self.intercept_errors:
-                    logger.error("Unhandled exception caught in oscpy server", exc_info=True)
+                    logger.exception("Ignoring unhandled exception caught in oscpy server")
                 else:
                     raise