Response can return bytes and Fix types

kobinpy · Dec 17, 2016 · ae7fe68 · ae7fe68
1 parent 0267afa
commit ae7fe68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/kobin/environs.py b/kobin/environs.py
@@ -198,6 +198,8 @@ def __init__(self, body='', status=None, headers=None, charset='utf-8'):
 
     @property
     def body(self):
+        if isinstance(self._body, bytes):
+            return [self._body]
         return [self._body.encode(self.charset)]
 
     @property

diff --git a/kobin/environs.pyi b/kobin/environs.pyi
@@ -26,6 +26,8 @@ class Request:
     @property
     def forms(self) -> Dict[str, str]: ...
     @property
+    def raw_body(self) -> bytes: ...
+    @property
     def body(self) -> str: ...
     @property
     def json(self) -> Dict[str, Any]: ...
@@ -65,11 +67,9 @@ class Response:
     _cookies: SimpleCookie
     charset: str
 
-    def __init__(self, body: str = ..., status: int = ..., headers: Dict = ...,
+    def __init__(self, body: Union[str, bytes] = ..., status: int = ..., headers: Dict = ...,
                  charset: str = ...) -> None: ...
     @property
-    def raw_body(self) -> bytes: ...
-    @property
     def body(self) -> str: ...
     @property
     def status_code(self) -> int: ...
@@ -86,6 +86,7 @@ class Response:
 class JSONResponse:
     dic: Dict[str, Any]
     json_dump_args: Dict[str, Any]
+    charset: str
 
     def __init__(self, dic: Dict, status: int = ..., headers: Dict = ...,
                  charset: str = ..., **dump_args: Any) -> None: ...
@@ -96,6 +97,7 @@ class JSONResponse:
 class TemplateResponse:
     template: Template
     tpl_args: Dict[str, Any]
+    charset: str
 
     def __init__(self, filename: str, status: int = ..., headers: Dict[str, str] = ...,
                  charset: str = ..., **tpl_args: Any) -> None: ...