inlined stream.close calls to better match falcon style

Author: jkmnt

falcon/app_helpers.py

@@ -18,8 +18,6 @@
 
 from inspect import iscoroutinefunction
 from typing import (
-    Any,
-    Awaitable,
     Callable,
     Iterable,
     List,
@@ -395,17 +393,6 @@ def __next__(self) -> bytes:
             return data
 
     def close(self) -> None:
-        close_maybe(self._stream)
-
-
-# TODO(jkmnt): Move these to some other module, they don't belong here
-def close_maybe(stream: Any) -> None:
-    close: Optional[Callable[[], None]] = getattr(stream, 'close', None)
-    if close:
-        close()
-
-
-async def async_close_maybe(stream: Any) -> None:
-    close: Optional[Callable[[], Awaitable[None]]] = getattr(stream, 'close', None)
-    if close:
-        await close()
+        close: Optional[Callable[[], None]] = getattr(self._stream, 'close', None)
+        if close:
+            close()

falcon/asgi/app.py

@@ -52,7 +52,6 @@
 from falcon._typing import AsgiSinkCallable
 from falcon._typing import SinkPrefix
 import falcon.app
-from falcon.app_helpers import async_close_maybe
 from falcon.app_helpers import AsyncPreparedMiddlewareResult
 from falcon.app_helpers import AsyncPreparedMiddlewareWsResult
 from falcon.app_helpers import prepare_middleware
@@ -773,13 +772,16 @@ async def watch_disconnect() -> None:
             #   (c) async iterator
             #
 
-            read_meth: Optional[Callable[[int], Awaitable[bytes]]] = getattr(
+            read: Optional[Callable[[int], Awaitable[bytes]]] = getattr(
                 stream, 'read', None
             )
-            if read_meth:
+            close: Optional[Callable[[], Awaitable[None]]] = getattr(
+                stream, 'close', None
+            )
+            if read:
                 try:
                     while True:
-                        data = await read_meth(self._STREAM_BLOCK_SIZE)
+                        data = await read(self._STREAM_BLOCK_SIZE)
                         if data == b'':
                             break
                         else:
@@ -793,7 +795,8 @@ async def watch_disconnect() -> None:
                                 }
                             )
                 finally:
-                    await async_close_maybe(stream)
+                    if close:
+                        await close()
             else:
                 # NOTE(kgriffs): Works for both async generators and iterators
                 try:
@@ -829,10 +832,8 @@ async def watch_disconnect() -> None:
                         'Response.stream: ' + str(ex)
                     )
                 finally:
-                    # NOTE(vytas): This could be DRYed with the above identical
-                    #   twoliner in a one large block, but OTOH we would be
-                    #   unable to reuse the current try.. except.
-                    await async_close_maybe(stream)
+                    if close:
+                        await close()
 
         await send(_EVT_RESP_EOF)
 

falcon/testing/helpers.py

@@ -59,7 +59,6 @@
 from falcon._typing import CookieArg
 from falcon._typing import HeaderArg
 from falcon._typing import ResponseStatus
-from falcon.app_helpers import close_maybe
 import falcon.asgi
 from falcon.asgi_spec import AsgiEvent
 from falcon.asgi_spec import EventType
@@ -1410,7 +1409,9 @@ def wrapper() -> Iterator[bytes]:
             for item in iterable:
                 yield item
         finally:
-            close_maybe(iterable)
+            close: Optional[Callable[[], None]] = getattr(iterable, 'close', None)
+            if close:
+                close()
 
     wrapped = wrapper()
     head: Tuple[bytes, ...]