Cleaning code
This commit is contained in:
parent
8ca9038122
commit
c59be2b698
43 changed files with 47 additions and 69 deletions
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
@ -27,13 +27,10 @@ from cuchulu.libraries.keyutils import create_key
|
|||
import traceback
|
||||
|
||||
from bottle import request
|
||||
#from flask import request
|
||||
#from werkzeug.utils import secure_filename
|
||||
|
||||
|
||||
|
||||
from uuid import uuid4
|
||||
#from cuchulu.libraries.db.extraforms.fileform import FileForm
|
||||
|
||||
class FileField(CharField):
|
||||
"""Field for upload and save files in server"""
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
@ -24,8 +24,6 @@ from cuchulu.libraries.db.corefields import CharField
|
|||
from cuchulu.libraries.db.extraforms.fileform import FileForm
|
||||
from cuchulu.libraries.keyutils import create_key
|
||||
import traceback
|
||||
#from flask import request
|
||||
#from werkzeug.utils import secure_filename
|
||||
from bottle import request
|
||||
|
||||
# from bottle import request
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
@ -19,11 +19,8 @@ You should have received a copy of the GNU Affero General Public License
|
|||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
#from cuchulu.libraries.db.webmodel import PhangoField
|
||||
from cuchulu.libraries.db.corefields import IntegerField
|
||||
from cuchulu.libraries.db.coreforms import SelectModelForm
|
||||
#from paramecio.citoplasma.httputils import GetPostFiles
|
||||
#from flask import request
|
||||
from bottle import request
|
||||
|
||||
class ParentField(IntegerField):
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ def ini_fields(fields):
|
|||
|
||||
def csrf_token(token_id='csrf_token'):
|
||||
|
||||
"""Function for generate a csrf token html hide form using flask sessions
|
||||
"""Function for generate a csrf token html hide form using sessions plugin
|
||||
|
||||
Args:
|
||||
token_id (str): Name of the html hide form
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ if hasattr(config, 'email_failed'):
|
|||
email_failed=config.email_failed
|
||||
|
||||
class ErrorReportingPlugin(object):
|
||||
"""Bottle plugin for """
|
||||
"""Bottle plugin for send email if exception
|
||||
|
||||
A simple plugin that send an email to email_failed config variable with email address.
|
||||
|
||||
"""
|
||||
|
||||
name = 'error_reporting'
|
||||
api = 2
|
||||
|
|
|
|||
|
|
@ -6,8 +6,11 @@ from settings import config
|
|||
from bottle import request
|
||||
|
||||
def filterip():
|
||||
#Check ip
|
||||
ip = request.environ.get('REMOTE_ADDR')
|
||||
"""Function for flter ip
|
||||
|
||||
"""
|
||||
|
||||
ip=request.environ.get('X-REAL-IP') or request.environ.get('HTTP_X_FORWARDED_FOR') or request.environ.get('REMOTE_ADDR')
|
||||
|
||||
if ip in config.allowed_ips:
|
||||
|
||||
|
|
@ -15,4 +18,4 @@ def filterip():
|
|||
else:
|
||||
|
||||
return False
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
"""
|
||||
Cuchulu2fm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulu2fm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
"""
|
||||
Cuchulu2fm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulu2fm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
Copyright (C) 2025 Antonio de la Rosa Caballero
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published by
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|||
|
||||
#import gettext
|
||||
from mako.template import Template
|
||||
#from flask import url_for as url_for_flask
|
||||
from mako.lookup import TemplateLookup
|
||||
from os import path
|
||||
try:
|
||||
|
|
@ -40,12 +39,6 @@ from cuchulu.libraries.db.formsutils import csrf_token
|
|||
from cuchulu.libraries.sessionplugin import get_session
|
||||
from cuchulu.wsgiapp import app
|
||||
|
||||
framework='flask'
|
||||
|
||||
if hasattr(config, 'framework'):
|
||||
framework=config.framework
|
||||
|
||||
|
||||
"""
|
||||
def _(text):
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Cuchulufm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulufm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Cuchulu2fm is a series of wrappers for Flask, mako and others and construct a simple headless cms.
|
||||
Cuchulu2fm is a series of wrappers for bottle, mako and others and construct a simple headless cms.
|
||||
|
||||
Copyright (C) 2023 Antonio de la Rosa Caballero
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
|
||||
#from flask import Blueprint
|
||||
from bottle import Bottle
|
||||
from cuchulu.libraries.mtemplates import PTemplate, env_theme
|
||||
from cuchulu.modules.admin.libraries.admin_auth import check_login
|
||||
from cuchulu.libraries.plugins import DbPlugin
|
||||
from cuchulu.libraries.sessionplugin import SessionPlugin
|
||||
|
||||
#admin_app=Blueprint('admin_app', __name__, static_folder='static')
|
||||
admin_app=Bottle()
|
||||
|
||||
dbplugin=DbPlugin()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
from settings import config
|
||||
#from flask import g, url_for, session
|
||||
from cuchulu.modules.admin.models.admin import UserAdmin
|
||||
from cuchulu.libraries.generate_admin_class import GenerateAdminClass
|
||||
from cuchulu.libraries.i18n import I18n, PGetText
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#from flask import Blueprint, redirect, session, url_for, request, g, make_response, abort
|
||||
from settings import config
|
||||
from cuchulu.libraries.i18n import I18n, PGetText
|
||||
from cuchulu.libraries.datetime import now, format_local_strtime, timestamp_to_datetime, obtain_timestamp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#from flask import g, request, redirect, session, url_for
|
||||
from cuchulu.libraries.db.webmodel import WebModel
|
||||
from settings import config
|
||||
from cuchulu.libraries.db.extrafields.passwordfield import PasswordField
|
||||
|
|
|
|||
|
|
@ -7,19 +7,10 @@ from settings import config
|
|||
from cuchulu.libraries.datetime import now, format_local_strtime, timestamp_to_datetime, obtain_timestamp
|
||||
from cuchulu.libraries.keyutils import create_key_encrypt, create_key
|
||||
from time import time
|
||||
#from cuchulu.wsgiapp import app
|
||||
#from cuchulu.modules.admin2 import admin_app
|
||||
#from bottle import request, redirect, Bottle, response
|
||||
#from flask import request, redirect
|
||||
from bottle import request, redirect
|
||||
#from cuchulu.modules.admin.libraries.loginplugin import check_login
|
||||
#from cuchulu.libraries.sessionplugin import SessionPlugin
|
||||
#from cuchulu.libraries.httputils import GetPostFiles
|
||||
from cuchulu.libraries.db.formsutils import check_form, csrf_token
|
||||
from cuchulu.libraries.db.coreforms import PasswordForm
|
||||
from cuchulu.libraries.sendmail import SendMail
|
||||
from bottle import request
|
||||
#from cuchulu.modules.admin.libraries.config import modules_admin
|
||||
|
||||
login_tries=5
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue