Merge branch 'master' into release

emmett/__main__.py

@@ -9,7 +9,6 @@
     :license: BSD-3-Clause
 """
 
-if __name__ == "__main__":
-    from .cli import main
+from emmett.cli import main
 
-    main(as_module=True)
+main(as_module=True)

emmett/__version__.py

@@ -1 +1 @@
-__version__ = "2.5.8"
+__version__ = "2.5.9"

emmett/http.py

@@ -221,7 +221,7 @@ async def asgi(self, scope, send):
                 return
             self._headers.update(self._get_stat_headers(stat_data))
             await self._send_headers(send)
-            if 'http.response.pathsend' in scope['extensions']:
+            if 'http.response.pathsend' in scope.get('extensions', {}):
                 await send({
                     'type': 'http.response.pathsend',
                     'path': str(self.file_path)

emmett/rsgi/wrappers.py

@@ -42,6 +42,12 @@ def __init__(
     def headers(self):
         return self._scope.headers
 
+    @cachedprop
+    def host(self) -> str:
+        if self._scope.http_version[0] == '1':
+            return self.headers.get('host')
+        return self._scope.authority
+
     @cachedprop
     def query_params(self) -> sdict[str, Union[str, List[str]]]:
         rv: sdict[str, Any] = sdict()

pyproject.toml

@@ -3,7 +3,7 @@ name = "emmett"
 
 [tool.poetry]
 name = "emmett"
-version = "2.5.8"
+version = "2.5.9"
 description = "The web framework for inventors"
 authors = ["Giovanni Barillari <[email protected]>"]
 license = "BSD-3-Clause"
@@ -47,7 +47,7 @@ emmett = "emmett.cli:main"
 [tool.poetry.dependencies]
 python = "^3.8"
 click = ">=6.0"
-granian = "~1.0.0"
+granian = "~1.0.2"
 emmett-crypto = "^0.5"
 pendulum = "~3.0.0"
 pyDAL = "17.3"