Merge branch 'master' of https://github.com/abersheeran/baize

baize/__version__.py

@@ -1,3 +1,3 @@
-VERSION = (0, 20, 6)
+VERSION = (0, 20, 7)
 
 __version__ = ".".join(map(str, VERSION))

baize/asgi/staticfiles.py

@@ -1,5 +1,6 @@
 import os
 import stat
+from typing import Optional
 
 from baize import staticfiles
 from baize.datastructures import URL
@@ -55,7 +56,7 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
             return await self.handle_404(scope, receive, send)
 
 
-class Pages(staticfiles.BasePages[ASGIApp], Files):
+class Pages(Files):
     """
     Provide the ASGI application to download files in the specified path or
     the specified directory under the specified package.
@@ -98,3 +99,10 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
             raise HTTPException(404)
         else:
             return await self.handle_404(scope, receive, send)
+
+    def ensure_absolute_path(self, path: str) -> Optional[str]:
+        abspath = super().ensure_absolute_path(path)
+        if abspath is not None:
+            if abspath.endswith("/"):
+                abspath += "index.html"
+        return abspath

baize/staticfiles.py

@@ -105,13 +105,3 @@ def set_response_headers(self, response: BaseResponse) -> None:
             "Cache-Control", f"{self.cacheability}, max-age={self.max_age}"
         )
         response.headers.append("Vary", "Accept-Encoding, User-Agent, Cookie, Referer")
-
-
-@mypyc_attr(allow_interpreted_subclasses=True)
-class BasePages(BaseFiles[Interface], Generic[Interface]):
-    def ensure_absolute_path(self, path: str) -> Optional[str]:
-        abspath = super().ensure_absolute_path(path)
-        if abspath is not None:
-            if abspath.endswith("/"):
-                abspath += "index.html"
-        return abspath

baize/wsgi/requests.py

@@ -1,5 +1,4 @@
 import json
-from itertools import chain
 from typing import Any, Dict, Iterator, Mapping, Optional
 from urllib.parse import parse_qsl
 
@@ -90,19 +89,12 @@ def headers(self) -> Headers:
         Note that in its internal storage, all keys are in lower case.
         """
         return Headers(
-            (key.lower().replace("_", "-"), value)
-            for key, value in chain(
-                (
-                    (key[5:], value)
-                    for key, value in self._environ.items()
-                    if key.startswith("HTTP_")
-                ),
-                (
-                    (key, self._environ[key])
-                    for key in ("CONTENT_TYPE", "CONTENT_LENGTH")
-                    if key in self._environ
-                ),
+            (
+                (key[5:] if key.startswith("HTTP_") else key).lower().replace("_", "-"),
+                value,
             )
+            for key, value in self._environ.items()
+            if key.startswith("HTTP_") or key in ("CONTENT_TYPE", "CONTENT_LENGTH")
         )
 
 

baize/wsgi/staticfiles.py

@@ -1,6 +1,6 @@
 import os
 import stat
-from typing import Iterable
+from typing import Iterable, Optional
 
 from baize import staticfiles
 from baize.datastructures import URL
@@ -53,7 +53,7 @@ def __call__(
             return self.handle_404(environ, start_response)
 
 
-class Pages(staticfiles.BasePages[WSGIApp], Files):
+class Pages(Files):
     """
     Provide the WSGI application to download files in the specified path or
     the specified directory under the specified package.
@@ -94,3 +94,10 @@ def __call__(
             raise HTTPException(404)
         else:
             return self.handle_404(environ, start_response)
+
+    def ensure_absolute_path(self, path: str) -> Optional[str]:
+        abspath = super().ensure_absolute_path(path)
+        if abspath is not None:
+            if abspath.endswith("/"):
+                abspath += "index.html"
+        return abspath

pyproject.toml

@@ -16,7 +16,7 @@ license = { text = "Apache-2.0" }
 name = "baize"
 readme = "README.md"
 requires-python = ">=3.7"
-version = "0.20.6"
+version = "0.20.7"
 
 [project.urls]
 Homepage = "https://github.com/abersheeran/baize"