diff options
Diffstat (limited to 'web-server/opendc/util/parameter_checker.py')
| -rw-r--r-- | web-server/opendc/util/parameter_checker.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/web-server/opendc/util/parameter_checker.py b/web-server/opendc/util/parameter_checker.py index f55e780e..d37256e0 100644 --- a/web-server/opendc/util/parameter_checker.py +++ b/web-server/opendc/util/parameter_checker.py @@ -1,4 +1,5 @@ -from opendc.util import database, exceptions +from opendc.util import exceptions +from opendc.util.database import Database def _missing_parameter(params_required, params_actual, parent=''): @@ -41,7 +42,7 @@ def _incorrect_parameter(params_required, params_actual, parent=''): if param_required == 'datetime': try: - database.string_to_datetime(param_actual) + Database.string_to_datetime(param_actual) except: return '{}.{}'.format(parent, param_name) @@ -54,6 +55,8 @@ def _incorrect_parameter(params_required, params_actual, parent=''): if param_required.startswith('list') and not isinstance(param_actual, list): return '{}.{}'.format(parent, param_name) + return None + def _format_parameter(parameter): """Format the output of a parameter check.""" @@ -64,7 +67,7 @@ def _format_parameter(parameter): def check(request, **kwargs): - """Return True if all required parameters are there.""" + """Check if all required parameters are there.""" for location, params_required in kwargs.items(): params_actual = getattr(request, 'params_{}'.format(location)) |