Merge branch 'master' into release

docs/orm/advanced.md

@@ -199,7 +199,7 @@ class Taggable(Model):
 
     has_many({'tags': {'via': 'taggings'}})
 
-    @fieldmethod('taglist')
+    @rowmethod('taglist')
     def get_taglist(self, row):
         return row.tags().column('name')
 

docs/request.md

@@ -148,11 +148,9 @@ So you've just learned three handy aspects of Emmett:
 HTTP/2
 ------
 
-*New in version 2.1*
+*Changed in version 2.5*
 
-Emmett supports serving requests following the HTTP/2 standard. In order to enable serving such requests the `h11` protocol implementation should be enabled in `develop` and `serve` commands using the `--http-protocol` option.
-
-Moreover, in order for the browser to use HTTP/2 protocol, SSL should be enabled. SSL certificate and key should be passed to `develop` and `serve` commands using the relevant `--ssl-certfile` and `--ssl-keyfile` options.
+Emmett supports serving requests following the HTTP/2 standard. In order for the browser to use HTTP/2 protocol, SSL should be enabled. SSL certificate and key should be passed to `develop` and `serve` commands using the relevant `--ssl-certfile` and `--ssl-keyfile` options.
 
 > **Hint:** a self-signed SSL certificate can be generated for development purposes using the `openssl` command, like: `openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 365 -nodes`.
 
@@ -170,3 +168,5 @@ async def index():
     await request.push_promise(url("static", "some_asset.js"))
     return {}
 ```
+
+> **Note:** Emmett's integrated HTTP server doesn't support push promises. In order to use this feature you will need to serve your application with a 3rd party server like Hypercorn.

emmett/__version__.py

@@ -1 +1 @@
-__version__ = "2.5.0"
+__version__ = "2.5.1"

emmett/routing/dispatchers.py

@@ -89,6 +89,9 @@ class WSCloseDispatcher(Dispatcher):
     async def dispatch(self, reqargs):
         try:
             await self.f(**reqargs)
+        except asyncio.CancelledError:
+            await asyncio.shield(self._parallel_flow(self.flow_close))
+            return
         except Exception:
             await self._parallel_flow(self.flow_close)
             raise
@@ -102,6 +105,9 @@ async def dispatch(self, reqargs):
         await self._parallel_flow(self.flow_open)
         try:
             await self.f(**reqargs)
+        except asyncio.CancelledError:
+            await asyncio.shield(self._parallel_flow(self.flow_close))
+            return
         except Exception:
             await self._parallel_flow(self.flow_close)
             raise

emmett/rsgi/handlers.py

@@ -17,7 +17,13 @@
 
 from typing import Awaitable, Callable, Optional, Tuple
 
-from granian.rsgi import Scope, HTTPProtocol, WebsocketProtocol, WebsocketMessageType
+from granian.rsgi import (
+    HTTPProtocol,
+    ProtocolClosed,
+    Scope,
+    WebsocketMessageType,
+    WebsocketProtocol
+)
 
 from ..ctx import RequestContext, WSContext, current
 from ..debug import smart_traceback, debug_handler
@@ -251,12 +257,15 @@ async def __call__(
 
     async def handle_transport(self, transport: WSTransport):
         await transport.accepted.wait()
-        while True:
-            msg = await transport.transport.receive()
-            if msg.kind == WebsocketMessageType.close:
-                transport.interrupted
-                break
-            await transport.input.put(msg)
+        try:
+            while True:
+                msg = await transport.transport.receive()
+                if msg.kind == WebsocketMessageType.close:
+                    transport.interrupted = True
+                    break
+                await transport.input.put(msg)
+        except ProtocolClosed:
+            transport.interrupted = True
 
     def handle_request(
         self,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "emmett"
-version = "2.5.0"
+version = "2.5.1"
 description = "The web framework for inventors"
 authors = ["Giovanni Barillari <[email protected]>"]
 license = "BSD-3-Clause"
@@ -43,7 +43,7 @@ emmett = "emmett.cli:main"
 [tool.poetry.dependencies]
 python = "^3.8"
 click = ">=6.0"
-granian = "~0.3.0"
+granian = "~0.4.0"
 emmett-crypto = "~0.3"
 pendulum = "~2.1.2"
 pyDAL = "17.3"