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 diff --git a/src/httpaste/cgi.py b/src/httpaste/cgi.py index c28d730..3c380c5 100755 --- a/src/httpaste/cgi.py +++ b/src/httpaste/cgi.py @@ -2,10 +2,10 @@ """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 = 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 e193e16..5ea3eab 100755 --- a/src/httpaste/fcgi.py +++ b/src/httpaste/fcgi.py @@ -2,11 +2,11 @@ """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 = load_config() -application = get_flask_app(config, server_config) +application = get_flask_app(config) if __name__ == '__main__': 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) diff --git a/src/httpaste/wsgi.py b/src/httpaste/wsgi.py index 9e43ff0..94887c1 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 = load_config() -application = get_flask_app(config, server_config) +application = get_flask_app(config)