From 50034d9ad6143ca348e507caa81c612c9ae135a5 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Sun, 3 Nov 2024 12:36:45 +0100 Subject: [PATCH] Modernize basecode, now cromosoma and citoplasma are deleted by more comprensible libraries, and libraries.db directory names --- MANIFEST.in | 5 +- paramecio/console.py | 2 +- paramecio/examples/index.py | 4 +- paramecio/frontend/i18nadmin.py | 2 +- paramecio/frontend/padmin.py | 2 +- paramecio/i18n/admin.py | 2 +- paramecio/i18n/common.py | 2 +- paramecio/index.py | 12 +-- .../{citoplasma => libraries}/__init__.py | 0 .../{citoplasma => libraries}/adminutils.py | 14 +-- .../{citoplasma => libraries}/base_admin.py | 10 +- .../{citoplasma => libraries}/check_i18n.py | 4 +- .../{citoplasma => libraries}/datetime.py | 2 +- .../{cromosoma => libraries/db}/.gitignore | 0 paramecio/{cromosoma => libraries/db}/LICENSE | 0 .../{cromosoma => libraries/db}/README.md | 0 .../{cromosoma => libraries/db}/__init__.py | 0 .../{cromosoma => libraries/db}/corefields.py | 6 +- .../{cromosoma => libraries/db}/coreforms.py | 0 .../db}/databases/__init__.py | 0 .../db}/databases/mysqldb.py | 0 .../db}/databases/pymysql.py | 0 .../db}/databases/sqlalchemy.py | 0 .../{cromosoma => libraries/db}/dbadmin.py | 2 +- .../db}/extrafields/__init__.py | 0 .../db}/extrafields/arrayfield.py | 2 +- .../db}/extrafields/colorfield.py | 4 +- .../db}/extrafields/datefield.py | 6 +- .../db}/extrafields/datetimefield.py | 6 +- .../db}/extrafields/dictfield.py | 2 +- .../db}/extrafields/emailfield.py | 2 +- .../db}/extrafields/filefield.py | 10 +- .../db}/extrafields/i18nfield.py | 10 +- .../db}/extrafields/imagefield.py | 10 +- .../db}/extrafields/ipfield.py | 2 +- .../db}/extrafields/langfield.py | 6 +- .../db}/extrafields/moneyfield.py | 2 +- .../db}/extrafields/parentfield.py | 8 +- .../db}/extrafields/passwordfield.py | 4 +- .../db}/extrafields/percentfield.py | 2 +- .../db}/extrafields/slugifyfield.py | 6 +- .../db}/extrafields/urlfield.py | 2 +- .../db}/extrafields/usernamefield.py | 4 +- .../db}/extraforms/__init__.py | 0 .../db}/extraforms/checkform.py | 2 +- .../db}/extraforms/colorform.py | 4 +- .../db}/extraforms/dateform.py | 6 +- .../db}/extraforms/fileform.py | 4 +- .../db}/extraforms/i18nform.py | 6 +- .../db}/extraforms/texthtmlform.py | 4 +- .../db}/extraforms/usernameform.py | 4 +- .../{cromosoma => libraries/db}/formsutils.py | 10 +- .../db}/querybuilder.py | 0 .../{cromosoma => libraries/db}/usermodel.py | 8 +- .../{cromosoma => libraries/db}/webmodel.py | 4 +- .../error_reporting.py | 2 +- .../{citoplasma => libraries}/filesize.py | 0 .../{citoplasma => libraries}/filterip.py | 0 .../generate_admin_class.py | 12 +-- .../{citoplasma => libraries}/gunicornssl.py | 0 .../hierarchy_links.py | 2 +- .../{citoplasma => libraries}/httputils.py | 4 +- paramecio/{citoplasma => libraries}/i18n.py | 2 +- paramecio/{citoplasma => libraries}/js.py | 4 +- .../{citoplasma => libraries}/keyutils.py | 0 paramecio/{citoplasma => libraries}/lists.py | 12 +-- .../{citoplasma => libraries}/mtemplates.py | 12 +-- paramecio/{citoplasma => libraries}/pages.py | 4 +- .../{citoplasma => libraries}/plugins.py | 6 +- .../{citoplasma => libraries}/sendmail.py | 0 .../{citoplasma => libraries}/sessions.py | 93 +++++++++---------- .../{citoplasma => libraries}/show_links.py | 0 .../{citoplasma => libraries}/slugify.py | 0 .../{citoplasma => libraries}/templates.py | 6 +- .../templates/forms/colorform.phtml | 0 .../templates/forms/dateform.phtml | 0 .../templates/forms/fileform.phtml | 0 .../templates/forms/i18nform.phtml | 0 .../templates/forms/modelform.html | 0 .../templates/forms/modelform.phtml | 0 .../templates/forms/texthtmlform.phtml | 0 .../templates/utils/admin.phtml | 0 .../templates/utils/insertform.phtml | 0 .../templates/utils/list.phtml | 0 .../templates/utils/translations.phtml | 0 .../templates/utils/verify_delete.phtml | 0 paramecio/{citoplasma => libraries}/urls.py | 0 paramecio/modules/admin/admin/ausers.py | 8 +- paramecio/modules/admin/index.py | 27 +++--- paramecio/modules/admin/models/admin.py | 14 +-- .../modules/admin/templates/admin/home.html | 2 +- paramecio/modules/javascript/load_js.py | 6 +- paramecio/modules/lang/admin/translations.py | 20 ++-- paramecio/modules/lang/index.py | 6 +- paramecio/modules/welcome/index.py | 4 +- paramecio/settings/config_admin.py.sample | 2 +- setup.py | 2 +- tests/arrayfieldtest.py | 4 +- tests/colorfieldtest.py | 2 +- tests/datetimetest.py | 2 +- tests/dictfieldtest.py | 4 +- tests/fieldstest.py | 6 +- tests/formtest.py | 4 +- tests/i18nfieldtest.py | 6 +- tests/imagefieldtest.py | 12 +-- tests/sendmailtest.py | 2 +- tests/slugifytest.py | 2 +- tests/webmodeltest.py | 4 +- 108 files changed, 250 insertions(+), 257 deletions(-) rename paramecio/{citoplasma => libraries}/__init__.py (100%) rename paramecio/{citoplasma => libraries}/adminutils.py (94%) rename paramecio/{citoplasma => libraries}/base_admin.py (79%) rename paramecio/{citoplasma => libraries}/check_i18n.py (98%) rename paramecio/{citoplasma => libraries}/datetime.py (99%) rename paramecio/{cromosoma => libraries/db}/.gitignore (100%) rename paramecio/{cromosoma => libraries/db}/LICENSE (100%) rename paramecio/{cromosoma => libraries/db}/README.md (100%) rename paramecio/{cromosoma => libraries/db}/__init__.py (100%) rename paramecio/{cromosoma => libraries/db}/corefields.py (98%) rename paramecio/{cromosoma => libraries/db}/coreforms.py (100%) rename paramecio/{cromosoma => libraries/db}/databases/__init__.py (100%) rename paramecio/{cromosoma => libraries/db}/databases/mysqldb.py (100%) rename paramecio/{cromosoma => libraries/db}/databases/pymysql.py (100%) rename paramecio/{cromosoma => libraries/db}/databases/sqlalchemy.py (100%) rename paramecio/{cromosoma => libraries/db}/dbadmin.py (99%) rename paramecio/{cromosoma => libraries/db}/extrafields/__init__.py (100%) rename paramecio/{cromosoma => libraries/db}/extrafields/arrayfield.py (95%) rename paramecio/{cromosoma => libraries/db}/extrafields/colorfield.py (89%) rename paramecio/{cromosoma => libraries/db}/extrafields/datefield.py (83%) rename paramecio/{cromosoma => libraries/db}/extrafields/datetimefield.py (89%) rename paramecio/{cromosoma => libraries/db}/extrafields/dictfield.py (94%) rename paramecio/{cromosoma => libraries/db}/extrafields/emailfield.py (91%) rename paramecio/{cromosoma => libraries/db}/extrafields/filefield.py (94%) rename paramecio/{cromosoma => libraries/db}/extrafields/i18nfield.py (93%) rename paramecio/{cromosoma => libraries/db}/extrafields/imagefield.py (96%) rename paramecio/{cromosoma => libraries/db}/extrafields/ipfield.py (85%) rename paramecio/{cromosoma => libraries/db}/extrafields/langfield.py (79%) rename paramecio/{cromosoma => libraries/db}/extrafields/moneyfield.py (90%) rename paramecio/{cromosoma => libraries/db}/extrafields/parentfield.py (83%) rename paramecio/{cromosoma => libraries/db}/extrafields/passwordfield.py (97%) rename paramecio/{cromosoma => libraries/db}/extrafields/percentfield.py (87%) rename paramecio/{cromosoma => libraries/db}/extrafields/slugifyfield.py (84%) rename paramecio/{cromosoma => libraries/db}/extrafields/urlfield.py (95%) rename paramecio/{cromosoma => libraries/db}/extrafields/usernamefield.py (76%) rename paramecio/{cromosoma => libraries/db}/extraforms/__init__.py (100%) rename paramecio/{cromosoma => libraries/db}/extraforms/checkform.py (91%) rename paramecio/{cromosoma => libraries/db}/extraforms/colorform.py (76%) rename paramecio/{cromosoma => libraries/db}/extraforms/dateform.py (82%) rename paramecio/{cromosoma => libraries/db}/extraforms/fileform.py (74%) rename paramecio/{cromosoma => libraries/db}/extraforms/i18nform.py (85%) rename paramecio/{cromosoma => libraries/db}/extraforms/texthtmlform.py (75%) rename paramecio/{cromosoma => libraries/db}/extraforms/usernameform.py (75%) rename paramecio/{cromosoma => libraries/db}/formsutils.py (93%) rename paramecio/{cromosoma => libraries/db}/querybuilder.py (100%) rename paramecio/{cromosoma => libraries/db}/usermodel.py (96%) rename paramecio/{cromosoma => libraries/db}/webmodel.py (99%) rename paramecio/{citoplasma => libraries}/error_reporting.py (95%) rename paramecio/{citoplasma => libraries}/filesize.py (100%) rename paramecio/{citoplasma => libraries}/filterip.py (100%) rename paramecio/{citoplasma => libraries}/generate_admin_class.py (96%) rename paramecio/{citoplasma => libraries}/gunicornssl.py (100%) rename paramecio/{citoplasma => libraries}/hierarchy_links.py (98%) rename paramecio/{citoplasma => libraries}/httputils.py (97%) rename paramecio/{citoplasma => libraries}/i18n.py (98%) rename paramecio/{citoplasma => libraries}/js.py (71%) rename paramecio/{citoplasma => libraries}/keyutils.py (100%) rename paramecio/{citoplasma => libraries}/lists.py (97%) rename paramecio/{citoplasma => libraries}/mtemplates.py (97%) rename paramecio/{citoplasma => libraries}/pages.py (93%) rename paramecio/{citoplasma => libraries}/plugins.py (95%) rename paramecio/{citoplasma => libraries}/sendmail.py (100%) rename paramecio/{citoplasma => libraries}/sessions.py (80%) rename paramecio/{citoplasma => libraries}/show_links.py (100%) rename paramecio/{citoplasma => libraries}/slugify.py (100%) rename paramecio/{citoplasma => libraries}/templates.py (95%) rename paramecio/{citoplasma => libraries}/templates/forms/colorform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/forms/dateform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/forms/fileform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/forms/i18nform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/forms/modelform.html (100%) rename paramecio/{citoplasma => libraries}/templates/forms/modelform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/forms/texthtmlform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/utils/admin.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/utils/insertform.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/utils/list.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/utils/translations.phtml (100%) rename paramecio/{citoplasma => libraries}/templates/utils/verify_delete.phtml (100%) rename paramecio/{citoplasma => libraries}/urls.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 22fb9d9..8497f71 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,8 +2,7 @@ include paramecio/*.py include README.md include LICENSE include REQUIREMENTS -recursive-include paramecio/citoplasma * +recursive-include paramecio/libraries * recursive-include paramecio/frontend * -recursive-include paramecio/cromosoma * recursive-include paramecio/settings * -recursive-include paramecio/modules * \ No newline at end of file +recursive-include paramecio/modules * diff --git a/paramecio/console.py b/paramecio/console.py index 2e949a7..cdf2943 100644 --- a/paramecio/console.py +++ b/paramecio/console.py @@ -7,7 +7,7 @@ import getpass import re from pathlib import Path from base64 import b64encode -from paramecio.cromosoma.webmodel import WebModel +from paramecio.libraries.db.webmodel import WebModel from paramecio.modules.admin.models.admin import UserAdmin from subprocess import call from urllib.parse import urlparse diff --git a/paramecio/examples/index.py b/paramecio/examples/index.py index 925668b..a6de3f5 100644 --- a/paramecio/examples/index.py +++ b/paramecio/examples/index.py @@ -1,5 +1,5 @@ -from paramecio.citoplasma.mtemplates import env_theme, PTemplate -from paramecio.citoplasma.urls import make_url +from paramecio.libraries.mtemplates import env_theme, PTemplate +from paramecio.libraries.urls import make_url from bottle import request from settings import config from paramecio.wsgiapp import app diff --git a/paramecio/frontend/i18nadmin.py b/paramecio/frontend/i18nadmin.py index 7b215f9..6eed6a7 100644 --- a/paramecio/frontend/i18nadmin.py +++ b/paramecio/frontend/i18nadmin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.check_i18n import start +from paramecio.libraries.check_i18n import start start() diff --git a/paramecio/frontend/padmin.py b/paramecio/frontend/padmin.py index 0ecf3de..307fea2 100644 --- a/paramecio/frontend/padmin.py +++ b/paramecio/frontend/padmin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.dbadmin import start +from paramecio.libraries.db.dbadmin import start start() diff --git a/paramecio/i18n/admin.py b/paramecio/i18n/admin.py index 8c545d9..a899a71 100644 --- a/paramecio/i18n/admin.py +++ b/paramecio/i18n/admin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.i18n import I18n I18n.l['en-US']=I18n.l.get('en-US', {}) diff --git a/paramecio/i18n/common.py b/paramecio/i18n/common.py index d260ca6..3cb8913 100644 --- a/paramecio/i18n/common.py +++ b/paramecio/i18n/common.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.i18n import I18n I18n.l['en-US']=I18n.l.get('en-US', {}) diff --git a/paramecio/index.py b/paramecio/index.py index 21eb6b2..c57aa83 100644 --- a/paramecio/index.py +++ b/paramecio/index.py @@ -4,18 +4,18 @@ from bottle import route, get, post, run, default_app, abort, request, response, from settings import config #from beaker.middleware import SessionMiddleware from mimetypes import guess_type -from paramecio.cromosoma.webmodel import WebModel -from paramecio.citoplasma.datetime import set_timezone +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.datetime import set_timezone #from itsdangerous import JSONWebSignatureSerializer -from paramecio.citoplasma.keyutils import create_key_encrypt, create_key_encrypt_256, create_key +from paramecio.libraries.keyutils import create_key_encrypt, create_key_encrypt_256, create_key from paramecio.wsgiapp import app -#from paramecio.citoplasma.sessions import after_session +#from paramecio.libraries.sessions import after_session modules_pass=False #app.reset() -#from paramecio.citoplasma.sessions import generate_session +#from paramecio.libraries.sessions import generate_session #Prepare links for static. #WARNING: only use this feature in development, not in production. @@ -113,7 +113,7 @@ def prepare_app(): set_timezone() if error_reporting: - from paramecio.citoplasma.error_reporting import ErrorReportingPlugin + from paramecio.libraries.error_reporting import ErrorReportingPlugin app.install(ErrorReportingPlugin()) diff --git a/paramecio/citoplasma/__init__.py b/paramecio/libraries/__init__.py similarity index 100% rename from paramecio/citoplasma/__init__.py rename to paramecio/libraries/__init__.py diff --git a/paramecio/citoplasma/adminutils.py b/paramecio/libraries/adminutils.py similarity index 94% rename from paramecio/citoplasma/adminutils.py rename to paramecio/libraries/adminutils.py index cc2d0ae..7698755 100644 --- a/paramecio/citoplasma/adminutils.py +++ b/paramecio/libraries/adminutils.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 from collections import OrderedDict -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.urls import make_url -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.httputils import GetPostFiles -from paramecio.citoplasma.keyutils import create_key_encrypt, create_key_encrypt_256, create_key -from paramecio.cromosoma.formsutils import generate_csrf +from paramecio.libraries.sessions import get_session +from paramecio.libraries.urls import make_url +from paramecio.libraries.i18n import I18n +from paramecio.libraries.httputils import GetPostFiles +from paramecio.libraries.keyutils import create_key_encrypt, create_key_encrypt_256, create_key +from paramecio.libraries.db.formsutils import generate_csrf from bottle import response,request -from paramecio.cromosoma.webmodel import WebModel +from paramecio.libraries.db.webmodel import WebModel from time import time try: diff --git a/paramecio/citoplasma/base_admin.py b/paramecio/libraries/base_admin.py similarity index 79% rename from paramecio/citoplasma/base_admin.py rename to paramecio/libraries/base_admin.py index 06e9673..4e40cfe 100644 --- a/paramecio/citoplasma/base_admin.py +++ b/paramecio/libraries/base_admin.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.mtemplates import PTemplate -from paramecio.citoplasma.adminutils import check_login, get_language, get_menu -from paramecio.cromosoma.webmodel import WebModel -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.mtemplates import PTemplate +from paramecio.libraries.adminutils import check_login, get_language, get_menu +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.sessions import get_session +from paramecio.libraries.i18n import I18n try: diff --git a/paramecio/citoplasma/check_i18n.py b/paramecio/libraries/check_i18n.py similarity index 98% rename from paramecio/citoplasma/check_i18n.py rename to paramecio/libraries/check_i18n.py index 96ccba4..4ec74d3 100644 --- a/paramecio/citoplasma/check_i18n.py +++ b/paramecio/libraries/check_i18n.py @@ -5,7 +5,7 @@ import os import re from pathlib import Path from importlib import import_module -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.i18n import I18n from settings import config pattern=re.compile('^\w+\.(py|html|phtml|js)$') @@ -91,7 +91,7 @@ def start(): file_lang="#!/usr/bin/env python3\n\n" - file_lang+="from paramecio.citoplasma.i18n import I18n\n\n" + file_lang+="from paramecio.libraries.i18n import I18n\n\n" for lang in I18n.dict_i18n: diff --git a/paramecio/citoplasma/datetime.py b/paramecio/libraries/datetime.py similarity index 99% rename from paramecio/citoplasma/datetime.py rename to paramecio/libraries/datetime.py index 9ad9703..4287712 100644 --- a/paramecio/citoplasma/datetime.py +++ b/paramecio/libraries/datetime.py @@ -6,7 +6,7 @@ try: from settings import config except: config={} -#from paramecio.citoplasma.sessions import get_session +#from paramecio.libraries.sessions import get_session from os import environ """Simple hook for timedate functions from Arrow datetime module. Maybe in the future use native python datetime functions or other libraries. Is simply an abstraction for not depend of particular library. diff --git a/paramecio/cromosoma/.gitignore b/paramecio/libraries/db/.gitignore similarity index 100% rename from paramecio/cromosoma/.gitignore rename to paramecio/libraries/db/.gitignore diff --git a/paramecio/cromosoma/LICENSE b/paramecio/libraries/db/LICENSE similarity index 100% rename from paramecio/cromosoma/LICENSE rename to paramecio/libraries/db/LICENSE diff --git a/paramecio/cromosoma/README.md b/paramecio/libraries/db/README.md similarity index 100% rename from paramecio/cromosoma/README.md rename to paramecio/libraries/db/README.md diff --git a/paramecio/cromosoma/__init__.py b/paramecio/libraries/db/__init__.py similarity index 100% rename from paramecio/cromosoma/__init__.py rename to paramecio/libraries/db/__init__.py diff --git a/paramecio/cromosoma/corefields.py b/paramecio/libraries/db/corefields.py similarity index 98% rename from paramecio/cromosoma/corefields.py rename to paramecio/libraries/db/corefields.py index 5a48807..f895d25 100644 --- a/paramecio/cromosoma/corefields.py +++ b/paramecio/libraries/db/corefields.py @@ -17,9 +17,9 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . """ -from paramecio.cromosoma.webmodel import PhangoField -from paramecio.cromosoma import coreforms -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.db.webmodel import PhangoField +from paramecio.libraries.db import coreforms +from paramecio.libraries.i18n import I18n #from bs4 import BeautifulSoup import bleach diff --git a/paramecio/cromosoma/coreforms.py b/paramecio/libraries/db/coreforms.py similarity index 100% rename from paramecio/cromosoma/coreforms.py rename to paramecio/libraries/db/coreforms.py diff --git a/paramecio/cromosoma/databases/__init__.py b/paramecio/libraries/db/databases/__init__.py similarity index 100% rename from paramecio/cromosoma/databases/__init__.py rename to paramecio/libraries/db/databases/__init__.py diff --git a/paramecio/cromosoma/databases/mysqldb.py b/paramecio/libraries/db/databases/mysqldb.py similarity index 100% rename from paramecio/cromosoma/databases/mysqldb.py rename to paramecio/libraries/db/databases/mysqldb.py diff --git a/paramecio/cromosoma/databases/pymysql.py b/paramecio/libraries/db/databases/pymysql.py similarity index 100% rename from paramecio/cromosoma/databases/pymysql.py rename to paramecio/libraries/db/databases/pymysql.py diff --git a/paramecio/cromosoma/databases/sqlalchemy.py b/paramecio/libraries/db/databases/sqlalchemy.py similarity index 100% rename from paramecio/cromosoma/databases/sqlalchemy.py rename to paramecio/libraries/db/databases/sqlalchemy.py diff --git a/paramecio/cromosoma/dbadmin.py b/paramecio/libraries/db/dbadmin.py similarity index 99% rename from paramecio/cromosoma/dbadmin.py rename to paramecio/libraries/db/dbadmin.py index 8e57590..5efe6bc 100644 --- a/paramecio/cromosoma/dbadmin.py +++ b/paramecio/libraries/db/dbadmin.py @@ -29,7 +29,7 @@ from datetime import date from pathlib import Path from colorama import init, Fore, Back, Style from importlib import import_module, reload -from paramecio.cromosoma.webmodel import WebModel +from paramecio.libraries.db.webmodel import WebModel sys.path.insert(0, os.path.realpath('.')) try: diff --git a/paramecio/cromosoma/extrafields/__init__.py b/paramecio/libraries/db/extrafields/__init__.py similarity index 100% rename from paramecio/cromosoma/extrafields/__init__.py rename to paramecio/libraries/db/extrafields/__init__.py diff --git a/paramecio/cromosoma/extrafields/arrayfield.py b/paramecio/libraries/db/extrafields/arrayfield.py similarity index 95% rename from paramecio/cromosoma/extrafields/arrayfield.py rename to paramecio/libraries/db/extrafields/arrayfield.py index 93d26b6..03a0645 100644 --- a/paramecio/cromosoma/extrafields/arrayfield.py +++ b/paramecio/libraries/db/extrafields/arrayfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.webmodel import PhangoField,WebModel +from paramecio.libraries.db.webmodel import PhangoField,WebModel import json class ArrayField(PhangoField): diff --git a/paramecio/cromosoma/extrafields/colorfield.py b/paramecio/libraries/db/extrafields/colorfield.py similarity index 89% rename from paramecio/cromosoma/extrafields/colorfield.py rename to paramecio/libraries/db/extrafields/colorfield.py index 673698e..2444ee3 100644 --- a/paramecio/cromosoma/extrafields/colorfield.py +++ b/paramecio/libraries/db/extrafields/colorfield.py @@ -1,5 +1,5 @@ -from paramecio.cromosoma.corefields import IntegerField -from paramecio.cromosoma.extraforms.colorform import ColorForm +from paramecio.libraries.db.corefields import IntegerField +from paramecio.libraries.db.extraforms.colorform import ColorForm class ColorField(IntegerField): diff --git a/paramecio/cromosoma/extrafields/datefield.py b/paramecio/libraries/db/extrafields/datefield.py similarity index 83% rename from paramecio/cromosoma/extrafields/datefield.py rename to paramecio/libraries/db/extrafields/datefield.py index 0ca8995..54a1500 100644 --- a/paramecio/cromosoma/extrafields/datefield.py +++ b/paramecio/libraries/db/extrafields/datefield.py @@ -1,6 +1,6 @@ -from paramecio.cromosoma.corefields import PhangoField -from paramecio.citoplasma import datetime -from paramecio.cromosoma.extraforms.dateform import DateForm +from paramecio.libraries.db.corefields import PhangoField +from paramecio.libraries import datetime +from paramecio.libraries.db.extraforms.dateform import DateForm class DateField(PhangoField): diff --git a/paramecio/cromosoma/extrafields/datetimefield.py b/paramecio/libraries/db/extrafields/datetimefield.py similarity index 89% rename from paramecio/cromosoma/extrafields/datetimefield.py rename to paramecio/libraries/db/extrafields/datetimefield.py index 4a5c57c..735e401 100644 --- a/paramecio/cromosoma/extrafields/datetimefield.py +++ b/paramecio/libraries/db/extrafields/datetimefield.py @@ -1,6 +1,6 @@ -from paramecio.cromosoma.corefields import PhangoField -from paramecio.citoplasma import datetime -from paramecio.cromosoma.extraforms.dateform import DateForm +from paramecio.libraries.db.corefields import PhangoField +from paramecio.libraries import datetime +from paramecio.libraries.db.extraforms.dateform import DateForm class DateTimeField(PhangoField): diff --git a/paramecio/cromosoma/extrafields/dictfield.py b/paramecio/libraries/db/extrafields/dictfield.py similarity index 94% rename from paramecio/cromosoma/extrafields/dictfield.py rename to paramecio/libraries/db/extrafields/dictfield.py index 1ef816e..c3328e2 100644 --- a/paramecio/cromosoma/extrafields/dictfield.py +++ b/paramecio/libraries/db/extrafields/dictfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.webmodel import WebModel, PhangoField +from paramecio.libraries.db.webmodel import WebModel, PhangoField try: import ujson as json diff --git a/paramecio/cromosoma/extrafields/emailfield.py b/paramecio/libraries/db/extrafields/emailfield.py similarity index 91% rename from paramecio/cromosoma/extrafields/emailfield.py rename to paramecio/libraries/db/extrafields/emailfield.py index 1c4be2e..8fc2bc7 100644 --- a/paramecio/cromosoma/extrafields/emailfield.py +++ b/paramecio/libraries/db/extrafields/emailfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.corefields import CharField +from paramecio.libraries.db.corefields import CharField import re mail_pattern=re.compile(r"\w[\w\.-]*@\w[\w\.-]+\.\w+") diff --git a/paramecio/cromosoma/extrafields/filefield.py b/paramecio/libraries/db/extrafields/filefield.py similarity index 94% rename from paramecio/cromosoma/extrafields/filefield.py rename to paramecio/libraries/db/extrafields/filefield.py index 65dbc3a..c2c5d51 100644 --- a/paramecio/cromosoma/extrafields/filefield.py +++ b/paramecio/libraries/db/extrafields/filefield.py @@ -1,17 +1,17 @@ import os import sys from pathlib import Path -from paramecio.cromosoma.corefields import CharField -from paramecio.cromosoma.extraforms.fileform import FileForm -from paramecio.citoplasma import httputils -from paramecio.citoplasma.keyutils import create_key +from paramecio.libraries.db.corefields import CharField +from paramecio.libraries.db.extraforms.fileform import FileForm +from paramecio.libraries import httputils +from paramecio.libraries.keyutils import create_key import traceback from bottle import request from uuid import uuid4 -#from paramecio.cromosoma.extraforms.fileform import FileForm +#from paramecio.libraries.db.extraforms.fileform import FileForm class FileField(CharField): diff --git a/paramecio/cromosoma/extrafields/i18nfield.py b/paramecio/libraries/db/extrafields/i18nfield.py similarity index 93% rename from paramecio/cromosoma/extrafields/i18nfield.py rename to paramecio/libraries/db/extrafields/i18nfield.py index 57ac34d..a4f2213 100644 --- a/paramecio/cromosoma/extrafields/i18nfield.py +++ b/paramecio/libraries/db/extrafields/i18nfield.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 import json -from paramecio.cromosoma.webmodel import PhangoField -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.cromosoma.extraforms.i18nform import I18nForm -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.httputils import GetPostFiles +from paramecio.libraries.db.webmodel import PhangoField +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.db.extraforms.i18nform import I18nForm +from paramecio.libraries.i18n import I18n +from paramecio.libraries.httputils import GetPostFiles import json import re diff --git a/paramecio/cromosoma/extrafields/imagefield.py b/paramecio/libraries/db/extrafields/imagefield.py similarity index 96% rename from paramecio/cromosoma/extrafields/imagefield.py rename to paramecio/libraries/db/extrafields/imagefield.py index 82154e5..87c18c2 100644 --- a/paramecio/cromosoma/extrafields/imagefield.py +++ b/paramecio/libraries/db/extrafields/imagefield.py @@ -1,10 +1,10 @@ import os import sys from pathlib import Path -from paramecio.cromosoma.corefields import CharField -from paramecio.cromosoma.extraforms.fileform import FileForm -from paramecio.citoplasma import httputils -from paramecio.citoplasma.keyutils import create_key +from paramecio.libraries.db.corefields import CharField +from paramecio.libraries.db.extraforms.fileform import FileForm +from paramecio.libraries import httputils +from paramecio.libraries.keyutils import create_key import traceback from bottle import request @@ -16,7 +16,7 @@ except: from uuid import uuid4 -#from paramecio.cromosoma.extraforms.fileform import FileForm +#from paramecio.libraries.db.extraforms.fileform import FileForm class ImageField(CharField): diff --git a/paramecio/cromosoma/extrafields/ipfield.py b/paramecio/libraries/db/extrafields/ipfield.py similarity index 85% rename from paramecio/cromosoma/extrafields/ipfield.py rename to paramecio/libraries/db/extrafields/ipfield.py index 4e87357..7c93e6e 100644 --- a/paramecio/cromosoma/extrafields/ipfield.py +++ b/paramecio/libraries/db/extrafields/ipfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.corefields import CharField +from paramecio.libraries.db.corefields import CharField import ipaddress class IpField(CharField): diff --git a/paramecio/cromosoma/extrafields/langfield.py b/paramecio/libraries/db/extrafields/langfield.py similarity index 79% rename from paramecio/cromosoma/extrafields/langfield.py rename to paramecio/libraries/db/extrafields/langfield.py index db8d5e5..00b84ab 100644 --- a/paramecio/cromosoma/extrafields/langfield.py +++ b/paramecio/libraries/db/extrafields/langfield.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.corefields import CharField -from paramecio.cromosoma import coreforms -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.db.corefields import CharField +from paramecio.libraries.db import coreforms +from paramecio.libraries.i18n import I18n class LangField(CharField): diff --git a/paramecio/cromosoma/extrafields/moneyfield.py b/paramecio/libraries/db/extrafields/moneyfield.py similarity index 90% rename from paramecio/cromosoma/extrafields/moneyfield.py rename to paramecio/libraries/db/extrafields/moneyfield.py index 9cdc3e0..70caa11 100644 --- a/paramecio/cromosoma/extrafields/moneyfield.py +++ b/paramecio/libraries/db/extrafields/moneyfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.corefields import DecimalField +from paramecio.libraries.db.corefields import DecimalField from decimal import Decimal, getcontext from locale import format_string diff --git a/paramecio/cromosoma/extrafields/parentfield.py b/paramecio/libraries/db/extrafields/parentfield.py similarity index 83% rename from paramecio/cromosoma/extrafields/parentfield.py rename to paramecio/libraries/db/extrafields/parentfield.py index dfb97f8..ccffbb0 100644 --- a/paramecio/cromosoma/extrafields/parentfield.py +++ b/paramecio/libraries/db/extrafields/parentfield.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -#from paramecio.cromosoma.webmodel import PhangoField -from paramecio.cromosoma.corefields import IntegerField -from paramecio.cromosoma.coreforms import SelectModelForm -from paramecio.citoplasma.httputils import GetPostFiles +#from paramecio.libraries.db.webmodel import PhangoField +from paramecio.libraries.db.corefields import IntegerField +from paramecio.libraries.db.coreforms import SelectModelForm +from paramecio.libraries.httputils import GetPostFiles class ParentField(IntegerField): diff --git a/paramecio/cromosoma/extrafields/passwordfield.py b/paramecio/libraries/db/extrafields/passwordfield.py similarity index 97% rename from paramecio/cromosoma/extrafields/passwordfield.py rename to paramecio/libraries/db/extrafields/passwordfield.py index bd4ae06..dd20613 100644 --- a/paramecio/cromosoma/extrafields/passwordfield.py +++ b/paramecio/libraries/db/extrafields/passwordfield.py @@ -19,8 +19,8 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . """ -from paramecio.cromosoma.corefields import PhangoField -from paramecio.cromosoma.coreforms import PasswordForm +from paramecio.libraries.db.corefields import PhangoField +from paramecio.libraries.db.coreforms import PasswordForm from hmac import compare_digest as compare_hash from hmac import compare_digest as compare_hash #try: diff --git a/paramecio/cromosoma/extrafields/percentfield.py b/paramecio/libraries/db/extrafields/percentfield.py similarity index 87% rename from paramecio/cromosoma/extrafields/percentfield.py rename to paramecio/libraries/db/extrafields/percentfield.py index 1aa3eb2..7d1712a 100644 --- a/paramecio/cromosoma/extrafields/percentfield.py +++ b/paramecio/libraries/db/extrafields/percentfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.corefields import IntegerField +from paramecio.libraries.db.corefields import IntegerField class PercentField(IntegerField): diff --git a/paramecio/cromosoma/extrafields/slugifyfield.py b/paramecio/libraries/db/extrafields/slugifyfield.py similarity index 84% rename from paramecio/cromosoma/extrafields/slugifyfield.py rename to paramecio/libraries/db/extrafields/slugifyfield.py index 3086450..bf9a835 100644 --- a/paramecio/cromosoma/extrafields/slugifyfield.py +++ b/paramecio/libraries/db/extrafields/slugifyfield.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.corefields import CharField -from paramecio.citoplasma.slugify import slugify -from paramecio.cromosoma.coreforms import HiddenForm +from paramecio.libraries.db.corefields import CharField +from paramecio.libraries.slugify import slugify +from paramecio.libraries.db.coreforms import HiddenForm class SlugifyField(CharField): diff --git a/paramecio/cromosoma/extrafields/urlfield.py b/paramecio/libraries/db/extrafields/urlfield.py similarity index 95% rename from paramecio/cromosoma/extrafields/urlfield.py rename to paramecio/libraries/db/extrafields/urlfield.py index f096c63..45af607 100644 --- a/paramecio/cromosoma/extrafields/urlfield.py +++ b/paramecio/libraries/db/extrafields/urlfield.py @@ -1,4 +1,4 @@ -from paramecio.cromosoma.corefields import CharField +from paramecio.libraries.db.corefields import CharField import re check_url = re.compile( diff --git a/paramecio/cromosoma/extrafields/usernamefield.py b/paramecio/libraries/db/extrafields/usernamefield.py similarity index 76% rename from paramecio/cromosoma/extrafields/usernamefield.py rename to paramecio/libraries/db/extrafields/usernamefield.py index 0ac0413..8b7c29a 100644 --- a/paramecio/cromosoma/extrafields/usernamefield.py +++ b/paramecio/libraries/db/extrafields/usernamefield.py @@ -1,5 +1,5 @@ -from paramecio.cromosoma.corefields import PhangoField -from paramecio.cromosoma.coreforms import PasswordForm +from paramecio.libraries.db.corefields import PhangoField +from paramecio.libraries.db.coreforms import PasswordForm from hmac import compare_digest as compare_hash import crypt import re diff --git a/paramecio/cromosoma/extraforms/__init__.py b/paramecio/libraries/db/extraforms/__init__.py similarity index 100% rename from paramecio/cromosoma/extraforms/__init__.py rename to paramecio/libraries/db/extraforms/__init__.py diff --git a/paramecio/cromosoma/extraforms/checkform.py b/paramecio/libraries/db/extraforms/checkform.py similarity index 91% rename from paramecio/cromosoma/extraforms/checkform.py rename to paramecio/libraries/db/extraforms/checkform.py index 9357e7a..dbeb5de 100644 --- a/paramecio/cromosoma/extraforms/checkform.py +++ b/paramecio/libraries/db/extraforms/checkform.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.coreforms import BaseForm +from paramecio.libraries.db.coreforms import BaseForm class CheckForm(BaseForm): diff --git a/paramecio/cromosoma/extraforms/colorform.py b/paramecio/libraries/db/extraforms/colorform.py similarity index 76% rename from paramecio/cromosoma/extraforms/colorform.py rename to paramecio/libraries/db/extraforms/colorform.py index 8b7872f..c1f3a24 100644 --- a/paramecio/cromosoma/extraforms/colorform.py +++ b/paramecio/libraries/db/extraforms/colorform.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.citoplasma.mtemplates import standard_t +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.mtemplates import standard_t class ColorForm(BaseForm): diff --git a/paramecio/cromosoma/extraforms/dateform.py b/paramecio/libraries/db/extraforms/dateform.py similarity index 82% rename from paramecio/cromosoma/extraforms/dateform.py rename to paramecio/libraries/db/extraforms/dateform.py index 0fe0a89..3e53764 100644 --- a/paramecio/cromosoma/extraforms/dateform.py +++ b/paramecio/libraries/db/extraforms/dateform.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.citoplasma.mtemplates import standard_t -from paramecio.citoplasma.datetime import format_timedata +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.mtemplates import standard_t +from paramecio.libraries.datetime import format_timedata class DateForm(BaseForm): diff --git a/paramecio/cromosoma/extraforms/fileform.py b/paramecio/libraries/db/extraforms/fileform.py similarity index 74% rename from paramecio/cromosoma/extraforms/fileform.py rename to paramecio/libraries/db/extraforms/fileform.py index 6215cfc..451cb6c 100644 --- a/paramecio/cromosoma/extraforms/fileform.py +++ b/paramecio/libraries/db/extraforms/fileform.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.citoplasma.mtemplates import env_theme, PTemplate +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.mtemplates import env_theme, PTemplate env=env_theme(__file__) diff --git a/paramecio/cromosoma/extraforms/i18nform.py b/paramecio/libraries/db/extraforms/i18nform.py similarity index 85% rename from paramecio/cromosoma/extraforms/i18nform.py rename to paramecio/libraries/db/extraforms/i18nform.py index 21b5b83..9d5c107 100644 --- a/paramecio/cromosoma/extraforms/i18nform.py +++ b/paramecio/libraries/db/extraforms/i18nform.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.mtemplates import standard_t +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.i18n import I18n +from paramecio.libraries.mtemplates import standard_t import json class I18nForm(BaseForm): diff --git a/paramecio/cromosoma/extraforms/texthtmlform.py b/paramecio/libraries/db/extraforms/texthtmlform.py similarity index 75% rename from paramecio/cromosoma/extraforms/texthtmlform.py rename to paramecio/libraries/db/extraforms/texthtmlform.py index 0f9c644..0179a70 100644 --- a/paramecio/cromosoma/extraforms/texthtmlform.py +++ b/paramecio/libraries/db/extraforms/texthtmlform.py @@ -1,6 +1,6 @@ -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.citoplasma.mtemplates import env_theme, PTemplate +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.mtemplates import env_theme, PTemplate env=env_theme(__file__) diff --git a/paramecio/cromosoma/extraforms/usernameform.py b/paramecio/libraries/db/extraforms/usernameform.py similarity index 75% rename from paramecio/cromosoma/extraforms/usernameform.py rename to paramecio/libraries/db/extraforms/usernameform.py index 0f9c644..0179a70 100644 --- a/paramecio/cromosoma/extraforms/usernameform.py +++ b/paramecio/libraries/db/extraforms/usernameform.py @@ -1,6 +1,6 @@ -from paramecio.cromosoma.coreforms import BaseForm -from paramecio.citoplasma.mtemplates import env_theme, PTemplate +from paramecio.libraries.db.coreforms import BaseForm +from paramecio.libraries.mtemplates import env_theme, PTemplate env=env_theme(__file__) diff --git a/paramecio/cromosoma/formsutils.py b/paramecio/libraries/db/formsutils.py similarity index 93% rename from paramecio/cromosoma/formsutils.py rename to paramecio/libraries/db/formsutils.py index b00610c..b821797 100644 --- a/paramecio/cromosoma/formsutils.py +++ b/paramecio/libraries/db/formsutils.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -from paramecio.cromosoma import corefields -from paramecio.cromosoma.coreforms import PasswordForm -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.keyutils import create_key_encrypt +from paramecio.libraries.db import corefields +from paramecio.libraries.db.coreforms import PasswordForm +from paramecio.libraries.i18n import I18n +from paramecio.libraries.sessions import get_session +from paramecio.libraries.keyutils import create_key_encrypt from bottle import request # Need unittest diff --git a/paramecio/cromosoma/querybuilder.py b/paramecio/libraries/db/querybuilder.py similarity index 100% rename from paramecio/cromosoma/querybuilder.py rename to paramecio/libraries/db/querybuilder.py diff --git a/paramecio/cromosoma/usermodel.py b/paramecio/libraries/db/usermodel.py similarity index 96% rename from paramecio/cromosoma/usermodel.py rename to paramecio/libraries/db/usermodel.py index 99b77d8..a2ead69 100644 --- a/paramecio/cromosoma/usermodel.py +++ b/paramecio/libraries/db/usermodel.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma.coreforms import PasswordForm -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.httputils import GetPostFiles +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db.coreforms import PasswordForm +from paramecio.libraries.i18n import I18n +from paramecio.libraries.httputils import GetPostFiles class UserModel(WebModel): diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/libraries/db/webmodel.py similarity index 99% rename from paramecio/cromosoma/webmodel.py rename to paramecio/libraries/db/webmodel.py index 459a79b..8c42d85 100644 --- a/paramecio/cromosoma/webmodel.py +++ b/paramecio/libraries/db/webmodel.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from paramecio.cromosoma.databases.sqlalchemy import SqlClass -from paramecio.cromosoma.coreforms import BaseForm, HiddenForm +from paramecio.libraries.db.databases.sqlalchemy import SqlClass +from paramecio.libraries.db.coreforms import BaseForm, HiddenForm import sys import re import uuid diff --git a/paramecio/citoplasma/error_reporting.py b/paramecio/libraries/error_reporting.py similarity index 95% rename from paramecio/citoplasma/error_reporting.py rename to paramecio/libraries/error_reporting.py index 04b75de..f6fc2ae 100644 --- a/paramecio/citoplasma/error_reporting.py +++ b/paramecio/libraries/error_reporting.py @@ -3,7 +3,7 @@ # A bottle plugin for send emails if from settings import config -from paramecio.citoplasma.sendmail import SendMail +from paramecio.libraries.sendmail import SendMail import sys, traceback email_failed='' diff --git a/paramecio/citoplasma/filesize.py b/paramecio/libraries/filesize.py similarity index 100% rename from paramecio/citoplasma/filesize.py rename to paramecio/libraries/filesize.py diff --git a/paramecio/citoplasma/filterip.py b/paramecio/libraries/filterip.py similarity index 100% rename from paramecio/citoplasma/filterip.py rename to paramecio/libraries/filterip.py diff --git a/paramecio/citoplasma/generate_admin_class.py b/paramecio/libraries/generate_admin_class.py similarity index 96% rename from paramecio/citoplasma/generate_admin_class.py rename to paramecio/libraries/generate_admin_class.py index f0a46dc..0a0e83e 100644 --- a/paramecio/citoplasma/generate_admin_class.py +++ b/paramecio/libraries/generate_admin_class.py @@ -1,10 +1,10 @@ -from paramecio.citoplasma.lists import SimpleList +from paramecio.libraries.lists import SimpleList from bottle import request -from paramecio.citoplasma.urls import add_get_parameters, redirect -from paramecio.citoplasma.mtemplates import set_flash_message -from paramecio.cromosoma.formsutils import show_form -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.httputils import GetPostFiles +from paramecio.libraries.urls import add_get_parameters, redirect +from paramecio.libraries.mtemplates import set_flash_message +from paramecio.libraries.db.formsutils import show_form +from paramecio.libraries.i18n import I18n +from paramecio.libraries.httputils import GetPostFiles from collections import OrderedDict class GenerateAdminClass: diff --git a/paramecio/citoplasma/gunicornssl.py b/paramecio/libraries/gunicornssl.py similarity index 100% rename from paramecio/citoplasma/gunicornssl.py rename to paramecio/libraries/gunicornssl.py diff --git a/paramecio/citoplasma/hierarchy_links.py b/paramecio/libraries/hierarchy_links.py similarity index 98% rename from paramecio/citoplasma/hierarchy_links.py rename to paramecio/libraries/hierarchy_links.py index 569b2bb..f24f997 100644 --- a/paramecio/citoplasma/hierarchy_links.py +++ b/paramecio/libraries/hierarchy_links.py @@ -1,6 +1,6 @@ #/usr/bin/env python3 -from paramecio.citoplasma.urls import add_get_parameters +from paramecio.libraries.urls import add_get_parameters class HierarchyLinks: diff --git a/paramecio/citoplasma/httputils.py b/paramecio/libraries/httputils.py similarity index 97% rename from paramecio/citoplasma/httputils.py rename to paramecio/libraries/httputils.py index 93ab337..8a4accf 100644 --- a/paramecio/citoplasma/httputils.py +++ b/paramecio/libraries/httputils.py @@ -2,8 +2,8 @@ import json, re from bottle import request, response -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.keyutils import create_key_encrypt +from paramecio.libraries.sessions import get_session +from paramecio.libraries.keyutils import create_key_encrypt from bottle import HTTPResponse no_csrf=False diff --git a/paramecio/citoplasma/i18n.py b/paramecio/libraries/i18n.py similarity index 98% rename from paramecio/citoplasma/i18n.py rename to paramecio/libraries/i18n.py index 18c10e5..2a1fad3 100644 --- a/paramecio/citoplasma/i18n.py +++ b/paramecio/libraries/i18n.py @@ -20,7 +20,7 @@ along with this program. If not, see . """ from importlib import import_module -from paramecio.citoplasma.sessions import get_session +from paramecio.libraries.sessions import get_session import json from bottle import request import gettext diff --git a/paramecio/citoplasma/js.py b/paramecio/libraries/js.py similarity index 71% rename from paramecio/citoplasma/js.py rename to paramecio/libraries/js.py index 04b3ed7..230ef17 100644 --- a/paramecio/citoplasma/js.py +++ b/paramecio/libraries/js.py @@ -1,5 +1,5 @@ -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.sessions import get_session +from paramecio.libraries.i18n import I18n from settings import config def make_js_url(file_path, module): diff --git a/paramecio/citoplasma/keyutils.py b/paramecio/libraries/keyutils.py similarity index 100% rename from paramecio/citoplasma/keyutils.py rename to paramecio/libraries/keyutils.py diff --git a/paramecio/citoplasma/lists.py b/paramecio/libraries/lists.py similarity index 97% rename from paramecio/citoplasma/lists.py rename to paramecio/libraries/lists.py index dc51a19..93cf2aa 100644 --- a/paramecio/citoplasma/lists.py +++ b/paramecio/libraries/lists.py @@ -1,14 +1,14 @@ #By default id is not showed -from paramecio.citoplasma.pages import Pages -from paramecio.citoplasma.urls import add_get_parameters -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.httputils import GetPostFiles +from paramecio.libraries.pages import Pages +from paramecio.libraries.urls import add_get_parameters +from paramecio.libraries.sessions import get_session +from paramecio.libraries.i18n import I18n +from paramecio.libraries.httputils import GetPostFiles from bottle import request import sys import re -from paramecio.citoplasma.pages import Pages +from paramecio.libraries.pages import Pages class SimpleList: diff --git a/paramecio/citoplasma/mtemplates.py b/paramecio/libraries/mtemplates.py similarity index 97% rename from paramecio/citoplasma/mtemplates.py rename to paramecio/libraries/mtemplates.py index 2685f45..215e5c8 100644 --- a/paramecio/citoplasma/mtemplates.py +++ b/paramecio/libraries/mtemplates.py @@ -22,12 +22,12 @@ along with this program. If not, see . from bottle import hook from mako.template import Template from mako.lookup import TemplateLookup -from paramecio.citoplasma.urls import make_url, make_url_domain, make_media_url, make_media_url_module, add_get_parameters -from paramecio.citoplasma.i18n import I18n, PGetText -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.adminutils import make_admin_url -from paramecio.cromosoma.formsutils import csrf_token -from paramecio.citoplasma.js import make_js_url +from paramecio.libraries.urls import make_url, make_url_domain, make_media_url, make_media_url_module, add_get_parameters +from paramecio.libraries.i18n import I18n, PGetText +from paramecio.libraries.sessions import get_session +from paramecio.libraries.adminutils import make_admin_url +from paramecio.libraries.db.formsutils import csrf_token +from paramecio.libraries.js import make_js_url from settings import config from os import path from collections import OrderedDict diff --git a/paramecio/citoplasma/pages.py b/paramecio/libraries/pages.py similarity index 93% rename from paramecio/citoplasma/pages.py rename to paramecio/libraries/pages.py index d0f34d8..33a68a6 100644 --- a/paramecio/citoplasma/pages.py +++ b/paramecio/libraries/pages.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 from math import ceil, floor -from paramecio.citoplasma.urls import add_get_parameters -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.urls import add_get_parameters +from paramecio.libraries.i18n import I18n class Pages: diff --git a/paramecio/citoplasma/plugins.py b/paramecio/libraries/plugins.py similarity index 95% rename from paramecio/citoplasma/plugins.py rename to paramecio/libraries/plugins.py index 8573ace..c5c5756 100644 --- a/paramecio/citoplasma/plugins.py +++ b/paramecio/libraries/plugins.py @@ -1,8 +1,8 @@ from paramecio.modules.admin.models.admin import UserAdmin from bottle import request -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.urls import redirect, make_url -from paramecio.cromosoma.webmodel import WebModel +from paramecio.libraries.sessions import get_session +from paramecio.libraries.urls import redirect, make_url +from paramecio.libraries.db.webmodel import WebModel import inspect class LoginPlugin(object): diff --git a/paramecio/citoplasma/sendmail.py b/paramecio/libraries/sendmail.py similarity index 100% rename from paramecio/citoplasma/sendmail.py rename to paramecio/libraries/sendmail.py diff --git a/paramecio/citoplasma/sessions.py b/paramecio/libraries/sessions.py similarity index 80% rename from paramecio/citoplasma/sessions.py rename to paramecio/libraries/sessions.py index 97b437c..29eb06d 100644 --- a/paramecio/citoplasma/sessions.py +++ b/paramecio/libraries/sessions.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.keyutils import create_key_encrypt, create_key_encrypt_256, create_key +from paramecio.libraries.keyutils import create_key_encrypt, create_key_encrypt_256, create_key from oslo_concurrency import lockutils @@ -142,77 +142,70 @@ elif config.session_opts['session.type']=='redis': import redis + def generate_session(session={}, max_age=None): + + token=create_key(30).replace('/', '#') + + s={'token': token} + + # Bug in python 3.6, if you put max_age how None, is passed to header cookie. + + if not max_age: + response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path'], httponly=True) + else: + response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path'], max_age=max_age, httponly=True) + + request.environ['session']=s + + save_session(token, s) + + request.environ['session']=s + + return s + + def regenerate_session(): + + token=create_key(30).replace('/', '#') + + s={'token': token} + + response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path'], httponly=True) + + save_session(token, s) + + request.environ['session']=s + + return ParamecioSession(s) + def load_session(token): s={} - r=redis.StrictRedis(host=config.session_opts['session.host'], port=config.session_opts['session.port'], db=config.session_opts['session.db']) + r=redis.Redis(host=config.session_opts['session.host'], port=config.session_opts['session.port'], decode_responses=True) value=r.get(token) + r.close() + if not value: s={'token': token} else: try: - s=json.loads(value.decode('utf-8')) + s=json.loads(value) except: s={'token': token} return s def save_session(token, session): - r=redis.StrictRedis(host=config.session_opts['session.host'], port=config.session_opts['session.port'], db=config.session_opts['session.db']) + r=redis.Redis(host=config.session_opts['session.host'], port=config.session_opts['session.port']) r.set(token, json.dumps(session)) + r.close() + def after_session(): pass - -elif config.session_opts['session.type']=='cookie': - - from itsdangerous.url_safe import URLSafeSerializer - - def generate_session(session : dict ={} , max_age=None): - - #se=UrlSafeSerializer(config.key_encrypt) - - #cookie_value=se.dumps(session) - - request.environ['session']=session - - return session - - def regenerate_session(): - - request.environ['session']={} - - return ParamecioSession({}) - - def load_session(token): - - se=URLSafeSerializer(config.key_encrypt) - - s=se.loads(token) - - return s - - def save_session(token, session, create_file=False): - - cookie=session - - try: - - if not max_age: - response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path'], httponly=True) - else: - response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path'], max_age=max_age, httponly=True) - - return True - - except: - - return False - else: diff --git a/paramecio/citoplasma/show_links.py b/paramecio/libraries/show_links.py similarity index 100% rename from paramecio/citoplasma/show_links.py rename to paramecio/libraries/show_links.py diff --git a/paramecio/citoplasma/slugify.py b/paramecio/libraries/slugify.py similarity index 100% rename from paramecio/citoplasma/slugify.py rename to paramecio/libraries/slugify.py diff --git a/paramecio/citoplasma/templates.py b/paramecio/libraries/templates.py similarity index 95% rename from paramecio/citoplasma/templates.py rename to paramecio/libraries/templates.py index 44138d4..0056670 100644 --- a/paramecio/citoplasma/templates.py +++ b/paramecio/libraries/templates.py @@ -1,9 +1,9 @@ #!/usr/bin/python from jinja2 import Template, Environment, FileSystemLoader -from paramecio.citoplasma.urls import make_url, make_media_url, make_media_url_module, add_get_parameters -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.sessions import get_session +from paramecio.libraries.urls import make_url, make_media_url, make_media_url_module, add_get_parameters +from paramecio.libraries.i18n import I18n +from paramecio.libraries.sessions import get_session from settings import config # Preparing envs for views of modules, and views of diff --git a/paramecio/citoplasma/templates/forms/colorform.phtml b/paramecio/libraries/templates/forms/colorform.phtml similarity index 100% rename from paramecio/citoplasma/templates/forms/colorform.phtml rename to paramecio/libraries/templates/forms/colorform.phtml diff --git a/paramecio/citoplasma/templates/forms/dateform.phtml b/paramecio/libraries/templates/forms/dateform.phtml similarity index 100% rename from paramecio/citoplasma/templates/forms/dateform.phtml rename to paramecio/libraries/templates/forms/dateform.phtml diff --git a/paramecio/citoplasma/templates/forms/fileform.phtml b/paramecio/libraries/templates/forms/fileform.phtml similarity index 100% rename from paramecio/citoplasma/templates/forms/fileform.phtml rename to paramecio/libraries/templates/forms/fileform.phtml diff --git a/paramecio/citoplasma/templates/forms/i18nform.phtml b/paramecio/libraries/templates/forms/i18nform.phtml similarity index 100% rename from paramecio/citoplasma/templates/forms/i18nform.phtml rename to paramecio/libraries/templates/forms/i18nform.phtml diff --git a/paramecio/citoplasma/templates/forms/modelform.html b/paramecio/libraries/templates/forms/modelform.html similarity index 100% rename from paramecio/citoplasma/templates/forms/modelform.html rename to paramecio/libraries/templates/forms/modelform.html diff --git a/paramecio/citoplasma/templates/forms/modelform.phtml b/paramecio/libraries/templates/forms/modelform.phtml similarity index 100% rename from paramecio/citoplasma/templates/forms/modelform.phtml rename to paramecio/libraries/templates/forms/modelform.phtml diff --git a/paramecio/citoplasma/templates/forms/texthtmlform.phtml b/paramecio/libraries/templates/forms/texthtmlform.phtml similarity index 100% rename from paramecio/citoplasma/templates/forms/texthtmlform.phtml rename to paramecio/libraries/templates/forms/texthtmlform.phtml diff --git a/paramecio/citoplasma/templates/utils/admin.phtml b/paramecio/libraries/templates/utils/admin.phtml similarity index 100% rename from paramecio/citoplasma/templates/utils/admin.phtml rename to paramecio/libraries/templates/utils/admin.phtml diff --git a/paramecio/citoplasma/templates/utils/insertform.phtml b/paramecio/libraries/templates/utils/insertform.phtml similarity index 100% rename from paramecio/citoplasma/templates/utils/insertform.phtml rename to paramecio/libraries/templates/utils/insertform.phtml diff --git a/paramecio/citoplasma/templates/utils/list.phtml b/paramecio/libraries/templates/utils/list.phtml similarity index 100% rename from paramecio/citoplasma/templates/utils/list.phtml rename to paramecio/libraries/templates/utils/list.phtml diff --git a/paramecio/citoplasma/templates/utils/translations.phtml b/paramecio/libraries/templates/utils/translations.phtml similarity index 100% rename from paramecio/citoplasma/templates/utils/translations.phtml rename to paramecio/libraries/templates/utils/translations.phtml diff --git a/paramecio/citoplasma/templates/utils/verify_delete.phtml b/paramecio/libraries/templates/utils/verify_delete.phtml similarity index 100% rename from paramecio/citoplasma/templates/utils/verify_delete.phtml rename to paramecio/libraries/templates/utils/verify_delete.phtml diff --git a/paramecio/citoplasma/urls.py b/paramecio/libraries/urls.py similarity index 100% rename from paramecio/citoplasma/urls.py rename to paramecio/libraries/urls.py diff --git a/paramecio/modules/admin/admin/ausers.py b/paramecio/modules/admin/admin/ausers.py index de81825..fa420ec 100644 --- a/paramecio/modules/admin/admin/ausers.py +++ b/paramecio/modules/admin/admin/ausers.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 from paramecio.modules.admin.models.admin import UserAdmin -from paramecio.citoplasma.urls import make_url -from paramecio.citoplasma.generate_admin_class import GenerateAdminClass +from paramecio.libraries.urls import make_url +from paramecio.libraries.generate_admin_class import GenerateAdminClass from paramecio2.libraries.i18n import I18n, PGetText -from paramecio.cromosoma.coreforms import SelectForm -from paramecio.citoplasma.sessions import get_session +from paramecio.libraries.db.coreforms import SelectForm +from paramecio.libraries.sessions import get_session from settings import config from bottle import request diff --git a/paramecio/modules/admin/index.py b/paramecio/modules/admin/index.py index 4b89bb2..a70e57e 100644 --- a/paramecio/modules/admin/index.py +++ b/paramecio/modules/admin/index.py @@ -1,24 +1,24 @@ #!/usr/bin/env python3 import traceback, sys -from paramecio.citoplasma.mtemplates import env_theme, PTemplate +from paramecio.libraries.mtemplates import env_theme, PTemplate from paramecio.modules.admin.models.admin import UserAdmin -from paramecio.citoplasma.i18n import load_lang, I18n -from paramecio.citoplasma.urls import make_url, add_get_parameters, redirect -from paramecio.citoplasma.sessions import get_session, generate_session +from paramecio.libraries.i18n import load_lang, I18n +from paramecio.libraries.urls import make_url, add_get_parameters, redirect +from paramecio.libraries.sessions import get_session, generate_session from bottle import get,post,response,request, Bottle from settings import config from settings import config_admin -from paramecio.citoplasma.adminutils import get_menu, get_language, make_admin_url, check_login, login_model -from paramecio.citoplasma.httputils import GetPostFiles -from paramecio.cromosoma.formsutils import show_form, pass_values_to_form, set_extra_forms_user -from paramecio.cromosoma.coreforms import PasswordForm -from paramecio.cromosoma.webmodel import WebModel +from paramecio.libraries.adminutils import get_menu, get_language, make_admin_url, check_login, login_model +from paramecio.libraries.httputils import GetPostFiles +from paramecio.libraries.db.formsutils import show_form, pass_values_to_form, set_extra_forms_user +from paramecio.libraries.db.coreforms import PasswordForm +from paramecio.libraries.db.webmodel import WebModel from importlib import import_module, reload from collections import OrderedDict from time import time -from paramecio.citoplasma.keyutils import create_key_encrypt, create_key_encrypt_256, create_key -from paramecio.citoplasma.sendmail import SendMail +from paramecio.libraries.keyutils import create_key_encrypt, create_key_encrypt_256, create_key +from paramecio.libraries.sendmail import SendMail from os import path from paramecio.wsgiapp import app import copy @@ -26,7 +26,7 @@ from paramecio.i18n import admin admin_app=Bottle() -#from citoplasma.login import LoginClass +#from libraries.login import LoginClass # Check login yes_recovery_login=False @@ -185,6 +185,8 @@ def home(module='', submodule='', t=t): else: + c=0 + user_admin.conditions=['WHERE privileges=%s', [2]] c=user_admin.select_count() @@ -503,5 +505,4 @@ def change_theme(): return {'error': error} - app.mount('/'+config.admin_folder+'/', admin_app) diff --git a/paramecio/modules/admin/models/admin.py b/paramecio/modules/admin/models/admin.py index bcd7e1b..9fdf718 100644 --- a/paramecio/modules/admin/models/admin.py +++ b/paramecio/modules/admin/models/admin.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.i18n import I18n -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma.usermodel import UserModel -from paramecio.cromosoma import corefields -from paramecio.cromosoma.extrafields.emailfield import EmailField -from paramecio.cromosoma.extrafields.passwordfield import PasswordField -from paramecio.cromosoma.extrafields.langfield import LangField +from paramecio.libraries.i18n import I18n +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db.usermodel import UserModel +from paramecio.libraries.db import corefields +from paramecio.libraries.db.extrafields.emailfield import EmailField +from paramecio.libraries.db.extrafields.passwordfield import PasswordField +from paramecio.libraries.db.extrafields.langfield import LangField class PrivilegesField(corefields.IntegerField): diff --git a/paramecio/modules/admin/templates/admin/home.html b/paramecio/modules/admin/templates/admin/home.html index a5d705d..9e98d8d 100644 --- a/paramecio/modules/admin/templates/admin/home.html +++ b/paramecio/modules/admin/templates/admin/home.html @@ -1,6 +1,6 @@ <% -from paramecio.citoplasma.sessions import get_session +from paramecio.libraries.sessions import get_session s=get_session() diff --git a/paramecio/modules/javascript/load_js.py b/paramecio/modules/javascript/load_js.py index 1d85909..5869e26 100644 --- a/paramecio/modules/javascript/load_js.py +++ b/paramecio/modules/javascript/load_js.py @@ -1,10 +1,10 @@ #!/usr/bin/python3 from paramecio.wsgiapp import app -from paramecio.citoplasma.mtemplates import env_theme, PTemplate +from paramecio.libraries.mtemplates import env_theme, PTemplate from settings import config -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.sessions import get_session +from paramecio.libraries.i18n import I18n from bottle import response import os diff --git a/paramecio/modules/lang/admin/translations.py b/paramecio/modules/lang/admin/translations.py index 5b4b7b2..5490c23 100644 --- a/paramecio/modules/lang/admin/translations.py +++ b/paramecio/modules/lang/admin/translations.py @@ -1,15 +1,15 @@ #from modules.pastafari.models.servers import OsServer -from paramecio.citoplasma.generate_admin_class import GenerateConfigClass -from paramecio.citoplasma.lists import SimpleList -from paramecio.citoplasma.adminutils import make_admin_url -#from paramecio.citoplasma.urls import make_url -from paramecio.citoplasma.i18n import I18n -from paramecio.citoplasma.urls import add_get_parameters +from paramecio.libraries.generate_admin_class import GenerateConfigClass +from paramecio.libraries.lists import SimpleList +from paramecio.libraries.adminutils import make_admin_url +#from paramecio.libraries.urls import make_url +from paramecio.libraries.i18n import I18n +from paramecio.libraries.urls import add_get_parameters from settings import config -from paramecio.citoplasma.httputils import GetPostFiles -from paramecio.cromosoma.coreforms import SelectForm, BaseForm -from paramecio.cromosoma.extraforms.i18nform import I18nForm +from paramecio.libraries.httputils import GetPostFiles +from paramecio.libraries.db.coreforms import SelectForm, BaseForm +from paramecio.libraries.db.extraforms.i18nform import I18nForm import re, json from collections import OrderedDict from importlib import import_module @@ -94,7 +94,7 @@ def admin(**args): file_lang="#!/usr/bin/env python3\n\n" - file_lang+="from paramecio.citoplasma.i18n import I18n\n\n" + file_lang+="from paramecio.libraries.i18n import I18n\n\n" z=0 diff --git a/paramecio/modules/lang/index.py b/paramecio/modules/lang/index.py index f814488..17c614c 100644 --- a/paramecio/modules/lang/index.py +++ b/paramecio/modules/lang/index.py @@ -1,7 +1,7 @@ -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.i18n import I18n from bottle import get,response,request -from paramecio.citoplasma.sessions import get_session -from paramecio.citoplasma.urls import redirect +from paramecio.libraries.sessions import get_session +from paramecio.libraries.urls import redirect import re @get('/change_lang/') diff --git a/paramecio/modules/welcome/index.py b/paramecio/modules/welcome/index.py index 64b0274..a3387d4 100644 --- a/paramecio/modules/welcome/index.py +++ b/paramecio/modules/welcome/index.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -from paramecio.citoplasma.mtemplates import PTemplate, env_theme -from paramecio.citoplasma.urls import make_url +from paramecio.libraries.mtemplates import PTemplate, env_theme +from paramecio.libraries.urls import make_url from paramecio.wsgiapp import app from settings import config diff --git a/paramecio/settings/config_admin.py.sample b/paramecio/settings/config_admin.py.sample index e2228c0..9b01844 100644 --- a/paramecio/settings/config_admin.py.sample +++ b/paramecio/settings/config_admin.py.sample @@ -1,7 +1,7 @@ #!/usr/bin/python3 import os -from paramecio.citoplasma.i18n import I18n, load_lang +from paramecio.libraries.i18n import I18n, load_lang from settings import config from importlib import import_module diff --git a/setup.py b/setup.py index 7c68b1f..76829f4 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup(name='paramecio', install_requires=['bottle', 'mako', 'pymysql', 'sqlalchemy', 'oslo.concurrency', 'itsdangerous', 'colorama','cherrypy', 'arrow', 'argon2-cffi', 'pillow', 'itsdangerous'], entry_points={'console_scripts': [ 'paramecio = paramecio.console:start', - 'parameciodb = paramecio.cromosoma.dbamin.start' + 'parameciodb = paramecio.libraries.db.dbamin.start' ]}, license='AGPLV3', platforms = 'any', diff --git a/tests/arrayfieldtest.py b/tests/arrayfieldtest.py index d6ea96f..2a2862a 100644 --- a/tests/arrayfieldtest.py +++ b/tests/arrayfieldtest.py @@ -1,6 +1,6 @@ from settings import config -from paramecio.cromosoma import corefields -from paramecio.cromosoma.extrafields.arrayfield import ArrayField +from paramecio.libraries.db import corefields +from paramecio.libraries.db.extrafields.arrayfield import ArrayField import unittest import json diff --git a/tests/colorfieldtest.py b/tests/colorfieldtest.py index bae48f1..50f7352 100644 --- a/tests/colorfieldtest.py +++ b/tests/colorfieldtest.py @@ -1,5 +1,5 @@ from settings import config -from paramecio.cromosoma.extrafields.colorfield import ColorField +from paramecio.libraries.db.extrafields.colorfield import ColorField import unittest class TestFieldMethods(unittest.TestCase): diff --git a/tests/datetimetest.py b/tests/datetimetest.py index 71941e8..d9f1f67 100644 --- a/tests/datetimetest.py +++ b/tests/datetimetest.py @@ -1,5 +1,5 @@ from settings import config -from paramecio.citoplasma import datetime +from paramecio.libraries import datetime import unittest class TestFieldMethods(unittest.TestCase): diff --git a/tests/dictfieldtest.py b/tests/dictfieldtest.py index 4a3c6ef..1cee8a3 100644 --- a/tests/dictfieldtest.py +++ b/tests/dictfieldtest.py @@ -1,6 +1,6 @@ from settings import config -from paramecio.cromosoma import corefields -from paramecio.cromosoma.extrafields.dictfield import DictField +from paramecio.libraries.db import corefields +from paramecio.libraries.db.extrafields.dictfield import DictField import unittest import json diff --git a/tests/fieldstest.py b/tests/fieldstest.py index 8fabed5..5730aa2 100644 --- a/tests/fieldstest.py +++ b/tests/fieldstest.py @@ -1,7 +1,7 @@ from settings import config -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma import corefields -from paramecio.cromosoma.extrafields.emailfield import EmailField +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db import corefields +from paramecio.libraries.db.extrafields.emailfield import EmailField import unittest class TestFieldMethods(unittest.TestCase): diff --git a/tests/formtest.py b/tests/formtest.py index 3d3521d..563881f 100644 --- a/tests/formtest.py +++ b/tests/formtest.py @@ -1,5 +1,5 @@ from settings import config -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma import corefields +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db import corefields import unittest diff --git a/tests/i18nfieldtest.py b/tests/i18nfieldtest.py index 32841f8..8a7dbe1 100644 --- a/tests/i18nfieldtest.py +++ b/tests/i18nfieldtest.py @@ -1,7 +1,7 @@ from settings import config -from paramecio.cromosoma.extrafields.i18nfield import I18nField -from paramecio.citoplasma.httputils import GetPostFiles -from paramecio.citoplasma.i18n import I18n +from paramecio.libraries.db.extrafields.i18nfield import I18nField +from paramecio.libraries.httputils import GetPostFiles +from paramecio.libraries.i18n import I18n import unittest class TestFieldMethods(unittest.TestCase): diff --git a/tests/imagefieldtest.py b/tests/imagefieldtest.py index eaa36da..ee564d5 100644 --- a/tests/imagefieldtest.py +++ b/tests/imagefieldtest.py @@ -1,7 +1,7 @@ from bottle import FileUpload -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma.extrafields.imagefield import ImageField -from paramecio.citoplasma.httputils import GetPostFiles +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db.extrafields.imagefield import ImageField +from paramecio.libraries.httputils import GetPostFiles from settings import config import unittest @@ -30,9 +30,9 @@ class TestFieldMethods(unittest.TestCase): """from settings import config from bottle import FileUpload -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma.imagefield import ImageField -from paramecio.citoplasma.httputils import GetPostFiles +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db.imagefield import ImageField +from paramecio.libraries.httputils import GetPostFiles import unittest class TestImageFieldMethods(unittest.TestCase): diff --git a/tests/sendmailtest.py b/tests/sendmailtest.py index 1905322..576571d 100644 --- a/tests/sendmailtest.py +++ b/tests/sendmailtest.py @@ -1,5 +1,5 @@ from settings import config -from paramecio.citoplasma import sendmail +from paramecio.libraries import sendmail import time import unittest diff --git a/tests/slugifytest.py b/tests/slugifytest.py index 5a49b93..be6e146 100644 --- a/tests/slugifytest.py +++ b/tests/slugifytest.py @@ -1,5 +1,5 @@ from settings import config -from paramecio.citoplasma import slugify +from paramecio.libraries import slugify import unittest class TestFieldMethods(unittest.TestCase): diff --git a/tests/webmodeltest.py b/tests/webmodeltest.py index 644a4a4..c219462 100644 --- a/tests/webmodeltest.py +++ b/tests/webmodeltest.py @@ -1,6 +1,6 @@ from settings import config -from paramecio.cromosoma.webmodel import WebModel -from paramecio.cromosoma import corefields +from paramecio.libraries.db.webmodel import WebModel +from paramecio.libraries.db import corefields import unittest # Create TestWebModelMethods