From 0c0eed50db973a2fb8b9fd6aad9ffd8c2c5da257 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 16 May 2022 01:17:04 +0200 Subject: [PATCH] Little fixes for documentation --- .../libraries/db/extrafields/moneyfield.py | 6 +- paramecio2/libraries/db/webmodel.py | 2 +- paramecio2/libraries/get_data.py | 66 +++++++------------ paramecio2/libraries/mtemplates.py | 8 ++- paramecio2/libraries/urls.py | 11 +++- paramecio2/tests/fields_test.py | 4 ++ 6 files changed, 52 insertions(+), 45 deletions(-) diff --git a/paramecio2/libraries/db/extrafields/moneyfield.py b/paramecio2/libraries/db/extrafields/moneyfield.py index 5d6de16..812db21 100644 --- a/paramecio2/libraries/db/extrafields/moneyfield.py +++ b/paramecio2/libraries/db/extrafields/moneyfield.py @@ -13,7 +13,11 @@ class MoneyField(DecimalField): def check(self, value): - value=Decimal(value) + try: + value=Decimal(value) + + except: + value=0 return value diff --git a/paramecio2/libraries/db/webmodel.py b/paramecio2/libraries/db/webmodel.py index e71b302..64610f7 100644 --- a/paramecio2/libraries/db/webmodel.py +++ b/paramecio2/libraries/db/webmodel.py @@ -136,7 +136,7 @@ class PhangoField: # Error by default - self.error_default='Error: field required' + self.error_default='Error: '+self.name+' field required' # Show this value formatted diff --git a/paramecio2/libraries/get_data.py b/paramecio2/libraries/get_data.py index b19966d..58f2a2e 100644 --- a/paramecio2/libraries/get_data.py +++ b/paramecio2/libraries/get_data.py @@ -1,3 +1,4 @@ +""" from settings import config wsgi_gateway='flask' @@ -6,48 +7,31 @@ if hasattr(config, 'wsgi_gateway'): wsgi_gateway=config.wsgi_gateway if wsgi_gateway=='flask': +""" +from flask import request - from flask import request +def get_query_args(key, default_value=''): + """Simple shortcuts for get query args from a http request + + A function that is used for have a shortcut for get query string args from a tipycal http request + + Args: + key (str): The arg name or query key for extract from args array + default_value (str): The default value if key is not set in args array + + """ - def get_query_args(key, default_value=''): - """Simple shortcuts for get query args from a http request - - A function that is used for have a shortcut for get query string args from a tipycal http request - - Args: - key (str): The arg name or query key for extract from args array - default_value (str): The default value if key is not set in args array - - """ + return request.args.get(key, default_value) - return request.args.get(key, default_value) - - def get_post_args(key, default_value=''): - """Simple shortcuts for get POST values from a http request - - A function that is used for have a shortcut for get POST values from a tipycal http POST request - - Args: - key (str): The arg name or form key for extract from POST array - default_value (str): The default value if key is not set in args array - """ - - return request.form.get(key, default_value) +def get_post_args(key, default_value=''): + """Simple shortcuts for get POST values from a http request + + A function that is used for have a shortcut for get POST values from a tipycal http POST request + + Args: + key (str): The arg name or form key for extract from POST array + default_value (str): The default value if key is not set in args array + """ + + return request.form.get(key, default_value) -elif wsgi_gateway=='bottle': - - from bottle import request - - def get_query_args(key, default_value=''): - """Simple shortcuts for get query args from a http request - - A function that is used for have a shortcut for get query string args from a tipycal http request - - Args: - key (str): The arg name or query key for extract from args array - default_value (str): The default value if key is not set in args array - - """ - - return request.query.get(key, default_value) - diff --git a/paramecio2/libraries/mtemplates.py b/paramecio2/libraries/mtemplates.py index 7984df7..e7858f9 100644 --- a/paramecio2/libraries/mtemplates.py +++ b/paramecio2/libraries/mtemplates.py @@ -4,7 +4,13 @@ from mako.template import Template from flask import session, url_for from mako.lookup import TemplateLookup from os import path -from settings import config +try: + from settings import config +except: + class config: + theme='default' + reloader=False + import gettext import sys from paramecio2.libraries.i18n import I18n diff --git a/paramecio2/libraries/urls.py b/paramecio2/libraries/urls.py index 736c683..38f2398 100644 --- a/paramecio2/libraries/urls.py +++ b/paramecio2/libraries/urls.py @@ -1,4 +1,13 @@ -from settings import config +try: + from settings import config +except: + + class config: + + application_root='/' + domain_url='http://localhost/' + yes_static=False + import urllib.parse def make_url(path, query_args={}): diff --git a/paramecio2/tests/fields_test.py b/paramecio2/tests/fields_test.py index 8efae36..f44027e 100644 --- a/paramecio2/tests/fields_test.py +++ b/paramecio2/tests/fields_test.py @@ -151,5 +151,9 @@ def test_test_emailfield(): assert field.check('example-example.com')=='' +def test_test_i18nfield(): + + pass +