From 843354e18dc6ed7f7273866a81a3b37e296b6647 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Fri, 15 Apr 2022 02:12:35 +0200 Subject: [PATCH 1/4] fix(cgi): remove redundant function --- src/httpaste/cgi.py | 4 ++-- src/httpaste/fcgi.py | 4 ++-- src/httpaste/wsgi.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/httpaste/cgi.py b/src/httpaste/cgi.py index c28d730..417e8a1 100755 --- a/src/httpaste/cgi.py +++ b/src/httpaste/cgi.py @@ -2,9 +2,9 @@ """httpaste CGI entrypoint """ from wsgiref.handlers import CGIHandler -from httpaste import load_config, get_flask_app, get_config_path +from httpaste import load_config, get_flask_app -config, server_config = load_config(get_config_path()) +config, server_config = load_config() application = get_flask_app(config, server_config) diff --git a/src/httpaste/fcgi.py b/src/httpaste/fcgi.py index e193e16..256fbc6 100755 --- a/src/httpaste/fcgi.py +++ b/src/httpaste/fcgi.py @@ -2,9 +2,9 @@ """httpaste FastCGI entrypoint """ from flup.server.fcgi import WSGIServer -from httpaste import load_config, get_flask_app, get_config_path +from httpaste import load_config, get_flask_app -config, server_config = load_config(get_config_path()) +config, server_config = load_config() application = get_flask_app(config, server_config) diff --git a/src/httpaste/wsgi.py b/src/httpaste/wsgi.py index 9e43ff0..30e513c 100755 --- a/src/httpaste/wsgi.py +++ b/src/httpaste/wsgi.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 """httpaste WSGI entrypoint """ -from httpaste import load_config, get_flask_app, get_config_path +from httpaste import load_config, get_flask_app -config, server_config = load_config(get_config_path()) +config, server_config = load_config() application = get_flask_app(config, server_config) From 0fb50c5a575d2f9993cf10934c7ceadeffdeefc2 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Fri, 15 Apr 2022 02:28:02 +0200 Subject: [PATCH 2/4] fix(helper/config::typecast): add boolean evaluation --- src/httpaste/helper/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/httpaste/helper/config.py b/src/httpaste/helper/config.py index f053cf3..29795e3 100755 --- a/src/httpaste/helper/config.py +++ b/src/httpaste/helper/config.py @@ -3,6 +3,7 @@ from pathlib import Path from configparser import ConfigParser, NoSectionError from typing import Optional, NamedTuple from os import environ +from ast import literal_eval CONFIGPATH_ENVIRON = 'HTTPASTE_CONFIGPATH' @@ -49,8 +50,9 @@ def typecast(obj: dict, aclass: type, dirname:Optional[Path] = None) -> dict: casted[k] = casted_val = dirname / v elif issubclass(bclass, bytes): - casted[k] = bclass(v.encode('utf-8')) + elif issubclass(bclass, bool): + casted[k] = literal_eval(v) else: try: casted_val = bclass(v) From 49604c1e37eeb1c72554042082c1ca4db12faf5a Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Fri, 15 Apr 2022 02:33:28 +0200 Subject: [PATCH 3/4] fix(__init__::load_config): override path --- src/httpaste/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/httpaste/__init__.py b/src/httpaste/__init__.py index a4aafd2..ab8c190 100755 --- a/src/httpaste/__init__.py +++ b/src/httpaste/__init__.py @@ -194,7 +194,7 @@ def load_config(path: str = None, var_name: str = CONFIGPATH_ENVIRON): """ """ - configIni, _ = get_configparser(path, var_name) + configIni, path = get_configparser(path, var_name) return get_config(configIni, Path(path).resolve().parent) @@ -203,6 +203,8 @@ def get_flask_app(config: Config) -> FlaskApp: """get a flask app object """ + print(config.server.swagger_ui) + options = {"swagger_ui": config.server.swagger_ui} #context manager returns a pathlib.Path object From 9845c85510f61eb6db90df2a5bf49dc76c16e253 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Fri, 15 Apr 2022 02:34:24 +0200 Subject: [PATCH 4/4] fix(cgi): adapt load_config() signature --- src/httpaste/cgi.py | 4 ++-- src/httpaste/fcgi.py | 4 ++-- src/httpaste/wsgi.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/httpaste/cgi.py b/src/httpaste/cgi.py index 417e8a1..3c380c5 100755 --- a/src/httpaste/cgi.py +++ b/src/httpaste/cgi.py @@ -4,8 +4,8 @@ from wsgiref.handlers import CGIHandler from httpaste import load_config, get_flask_app -config, server_config = load_config() +config = load_config() -application = get_flask_app(config, server_config) +application = get_flask_app(config) CGIHandler().run(application) diff --git a/src/httpaste/fcgi.py b/src/httpaste/fcgi.py index 256fbc6..5ea3eab 100755 --- a/src/httpaste/fcgi.py +++ b/src/httpaste/fcgi.py @@ -4,9 +4,9 @@ from flup.server.fcgi import WSGIServer from httpaste import load_config, get_flask_app -config, server_config = load_config() +config = load_config() -application = get_flask_app(config, server_config) +application = get_flask_app(config) if __name__ == '__main__': diff --git a/src/httpaste/wsgi.py b/src/httpaste/wsgi.py index 30e513c..94887c1 100755 --- a/src/httpaste/wsgi.py +++ b/src/httpaste/wsgi.py @@ -3,6 +3,6 @@ """ from httpaste import load_config, get_flask_app -config, server_config = load_config() +config = load_config() -application = get_flask_app(config, server_config) +application = get_flask_app(config)