Skip to content

Commit

Permalink
Replace integer status codes with Enum values of StatusCodes (#436)
Browse files Browse the repository at this point in the history
* replace integer status codes with Enum values of StatusCodes

* change imports to first import it to __init__.py and the re-export it

* fix circular import
  • Loading branch information
Noborita9 authored Mar 9, 2023
1 parent 2ae6585 commit 0569bc5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion robyn/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from robyn.robyn import FunctionInfo, Response
from robyn.router import MiddlewareRouter, Router, WebSocketRouter
from robyn.types import Directory, Header
from robyn.status_codes import StatusCodes
from robyn.ws import WS


Expand Down Expand Up @@ -315,4 +316,4 @@ def inner(handler):
return inner


__all__ = ["Robyn", "jsonify", "serve_file", "serve_html", "Response"]
__all__ = ["Robyn", "jsonify", "serve_file", "serve_html", "Response", "StatusCodes"]
7 changes: 4 additions & 3 deletions robyn/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from typing import Callable, Dict, List, Tuple, Union

from robyn.robyn import FunctionInfo, Response
from robyn.status_codes import StatusCodes
from robyn.ws import WS

Route = Tuple[str, str, FunctionInfo, bool]
Expand All @@ -26,7 +27,7 @@ def __init__(self) -> None:
def _format_response(self, res):
response = {}
if isinstance(res, dict):
status_code = res.get("status_code", 200)
status_code = res.get("status_code", StatusCodes.HTTP_200_OK.value)
headers = res.get("headers", {"Content-Type": "text/plain"})
body = res.get("body", "")

Expand All @@ -41,13 +42,13 @@ def _format_response(self, res):
response = res
elif isinstance(res, bytes):
response = Response(
status_code=200,
status_code=StatusCodes.HTTP_200_OK.value,
headers={"Content-Type": "application/octet-stream"},
body=res,
)
else:
response = Response(
status_code=200,
status_code=StatusCodes.HTTP_200_OK.value,
headers={"Content-Type": "text/plain"},
body=str(res).encode("utf-8"),
)
Expand Down
4 changes: 3 additions & 1 deletion robyn/templating.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from abc import ABC, abstractmethod

from robyn.status_codes import StatusCodes

from .robyn import Response

from jinja2 import Environment, FileSystemLoader
Expand All @@ -25,7 +27,7 @@ def __init__(self, directory, encoding="utf-8", followlinks=False):
def render_template(self, template_name, **kwargs) -> Response:
rendered_template = self.env.get_template(template_name).render(**kwargs)
return Response(
status_code=200,
status_code=StatusCodes.HTTP_200_OK.value,
body=rendered_template,
headers={"Content-Type": "text/html; charset=utf-8"},
)
Expand Down

0 comments on commit 0569bc5

Please sign in to comment.