CheeseAPI 1.2.0__tar.gz → 1.2.1__tar.gz

{cheeseapi-1.2.0 → cheeseapi-1.2.1}/CheeseAPI/handle.py

@@ -361,7 +361,7 @@ class Handle:
 
     async def http_static(self, protocol: 'HttpProtocol'):
         if self._app.server.static and self._app.workspace.static and protocol.request.path.startswith(self._app.server.static) and protocol.request.method == http.HTTPMethod.GET:
-            for key in [ '', '.html', 'index.html', '/index.html' ]:
+            for key in [ '', '.html', '/index.html' ]:
                 try:
                     protocol.response = FileResponse(os.path.join(self._app.workspace.static, protocol.request.path[1:] + key))
 

{cheeseapi-1.2.0 → cheeseapi-1.2.1}/CheeseAPI/protocol.py

@@ -54,9 +54,6 @@ class HttpProtocol(asyncio.Protocol):
                 t.split('=')[0]: t.split('=')[1] for t in self.request.headers['Cookie'].split('; ')
             }
 
-        if not self.parser.should_upgrade() and not int(self.request.headers.get('Content-Length', 0)):
-            asyncio.get_event_loop().create_task(app._handle.http(self))
-
     def on_body(self, body: bytes):
         if self.request.body is None:
             self.request._body = b''

{cheeseapi-1.2.0 → cheeseapi-1.2.1}/CheeseAPI/response.py

@@ -397,7 +397,7 @@ class BaseResponse:
             elif isinstance(self.body, str):
                 _value = self.body.encode()
             elif isinstance(self.body, bytes):
-                _value += self.body
+                _value = self.body
             if _value:
                 value += b'%x\r\n' % len(_value) + _value + b'\r\n0\r\n\r\n'
 

{cheeseapi-1.2.0 → cheeseapi-1.2.1}/CheeseAPI/validator.py

@@ -40,7 +40,7 @@ class Validator:
         *,
         required: bool = False,
         default: Any = None,
-        type: List[object | Callable] | object | Callable = str,
+        type: List[object | Callable] | object | Callable = None,
         expected_type: str | None = None,
         pattern: str | None = None,
         min: object | None = None,
@@ -101,7 +101,7 @@ class Validator:
         self._scope: Literal['form', 'headers', 'args', 'path', 'cookie'] = scope
         self.key: str = key
         self._type: List[object | Callable] | object | Callable = type
-        self._expected_type: str = type.__name__ if expected_type is None else expected_type
+        self._expected_type: str | None = type.__name__ if expected_type is None and self._type is not None else expected_type
         self.required: bool = required
         self._default: Any = default
         self._pattern: str | None = pattern
@@ -124,7 +124,8 @@ class Validator:
             if self.required:
                 raise ValidateError(self.response or Response(app._text.validator_requiredMessage(self.scope, self.key), 400))
             validatedForm[f'{self.scope}.{self.key}'] = self.default
-        else:
+
+        if validatedForm[f'{self.scope}.{self.key}'] is not None:
             if self.type is not None:
                 try:
                     if isinstance(self.type, list):
@@ -203,7 +204,7 @@ class Validator:
 
     @expected_type.setter
     def expected_type(self, value: str | None):
-        self._expected_type = self.type.__name__ if value is None else value
+        self._expected_type = self.type.__name__ if value is None and self.type is not None else value
 
     @property
     def default(self) -> Any:

{cheeseapi-1.2.0 → cheeseapi-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: CheeseAPI
-Version: 1.2.0
+Version: 1.2.1
 Summary: 一款web协程框架。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>

{cheeseapi-1.2.0 → cheeseapi-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "1.2.0"
+version = "1.2.1"
 description = "一款web协程框架。"
 readme = "README.md"
 license-files = { paths = [ "LICENSE" ] }