mirror of
https://gitee.com/open-loongarch/buildroot-2024.08.git
synced 2026-10-27 21:47:12 +08:00
first commit: base 2024.08
Signed-off-by: maoxiaochuan <maoxiaochuan@loongson.cn>
This commit is contained in:
tao89959
@@ -0,0 +1,294 @@
|
||||
From ad5cbbfdfacdcd3b4663e91a638de022d6e20477 Mon Sep 17 00:00:00 2001
|
||||
From: eevelweezel <eevel.weezel@gmail.com>
|
||||
Date: Mon, 6 Nov 2023 00:17:20 -0600
|
||||
Subject: [PATCH] fix regexen and classname
|
||||
|
||||
Upstream: https://github.com/web2py/web2py/commit/ad5cbbfdfacdcd3b4663e91a638de022d6e20477
|
||||
[yann.morin.1998@free.fr: backport from upstream]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
applications/admin/controllers/default.py | 64 +++++++++++------------
|
||||
gluon/compileapp.py | 4 +-
|
||||
gluon/contrib/appconfig.py | 2 +-
|
||||
3 files changed, 35 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
|
||||
index 88697267..c53a3a76 100644
|
||||
--- a/applications/admin/controllers/default.py
|
||||
+++ b/applications/admin/controllers/default.py
|
||||
@@ -85,7 +85,7 @@ def safe_open(a, b):
|
||||
return tmp()
|
||||
|
||||
a_for_check = os.path.abspath(os.path.normpath(a))
|
||||
-
|
||||
+
|
||||
web2py_apps_root = os.path.abspath(up(request.folder))
|
||||
web2py_deposit_root = os.path.join(up(web2py_apps_root), 'deposit')
|
||||
|
||||
@@ -230,7 +230,7 @@ def site():
|
||||
class IS_VALID_APPNAME(object):
|
||||
|
||||
def __call__(self, value):
|
||||
- if not re.compile('^\w+$').match(value):
|
||||
+ if not re.compile(r'^\w+$').match(value):
|
||||
return (value, T('Invalid application name'))
|
||||
if not request.vars.overwrite and \
|
||||
os.path.exists(os.path.join(apath(r=request), value)):
|
||||
@@ -321,7 +321,7 @@ def site():
|
||||
session.flash = T(msg, dict(appname=form_update.vars.name))
|
||||
redirect(URL(r=request))
|
||||
|
||||
- regex = re.compile('^\w+$')
|
||||
+ regex = re.compile(r'^\w+$')
|
||||
|
||||
if is_manager():
|
||||
apps = [a for a in os.listdir(apath(r=request)) if regex.match(a) and
|
||||
@@ -341,7 +341,7 @@ def site():
|
||||
def report_progress(app):
|
||||
import datetime
|
||||
progress_file = os.path.join(apath(app, r=request), 'progress.log')
|
||||
- regex = re.compile('\[(.*?)\][^\:]+\:\s+(\-?\d+)')
|
||||
+ regex = re.compile(r'\[(.*?)\][^\:]+\:\s+(\-?\d+)')
|
||||
if not os.path.exists(progress_file):
|
||||
return []
|
||||
matches = regex.findall(open(progress_file, 'r').read())
|
||||
@@ -609,7 +609,7 @@ def test():
|
||||
if len(request.args) > 1:
|
||||
file = request.args[1]
|
||||
else:
|
||||
- file = '.*\.py'
|
||||
+ file = r'.*\.py'
|
||||
|
||||
controllers = listdir(
|
||||
apath('%s/controllers/' % app, r=request), file + '$')
|
||||
@@ -869,12 +869,12 @@ def todolist():
|
||||
app_path = apath('%(app)s' % {'app': app}, r=request)
|
||||
dirs = ['models', 'controllers', 'modules', 'private']
|
||||
|
||||
- def listfiles(app, dir, regexp='.*\.py$'):
|
||||
+ def listfiles(app, dir, regexp=r'.*\.py$'):
|
||||
files = sorted(listdir(apath('%(app)s/%(dir)s/' % {'app': app, 'dir': dir}, r=request), regexp))
|
||||
files = [x.replace(os.path.sep, '/') for x in files if not x.endswith('.bak')]
|
||||
return files
|
||||
|
||||
- pattern = '#\s*(todo)+\s+(.*)'
|
||||
+ pattern = r'#\s*(todo)+\s+(.*)'
|
||||
regex = re.compile(pattern, re.IGNORECASE)
|
||||
|
||||
output = []
|
||||
@@ -1126,7 +1126,7 @@ def design():
|
||||
redirect(URL('site'))
|
||||
|
||||
# Get all models
|
||||
- models = listdir(apath('%s/models/' % app, r=request), '.*\.py$')
|
||||
+ models = listdir(apath('%s/models/' % app, r=request), r'.*\.py$')
|
||||
models = [x.replace('\\', '/') for x in models]
|
||||
defines = {}
|
||||
for m in models:
|
||||
@@ -1136,7 +1136,7 @@ def design():
|
||||
|
||||
# Get all controllers
|
||||
controllers = sorted(
|
||||
- listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
|
||||
+ listdir(apath('%s/controllers/' % app, r=request), r'.*\.py$'))
|
||||
controllers = [x.replace('\\', '/') for x in controllers]
|
||||
functions = {}
|
||||
for c in controllers:
|
||||
@@ -1149,7 +1149,7 @@ def design():
|
||||
|
||||
# Get all views
|
||||
views = sorted(
|
||||
- listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$'))
|
||||
+ listdir(apath('%s/views/' % app, r=request), r'[\w/\-]+(\.\w+)+$'))
|
||||
views = [x.replace('\\', '/') for x in views if not x.endswith('.bak')]
|
||||
extend = {}
|
||||
include = {}
|
||||
@@ -1164,17 +1164,17 @@ def design():
|
||||
include[c] = [i[1] for i in items]
|
||||
|
||||
# Get all modules
|
||||
- modules = listdir(apath('%s/modules/' % app, r=request), '.*\.py$')
|
||||
+ modules = listdir(apath('%s/modules/' % app, r=request), r'.*\.py$')
|
||||
modules = modules = [x.replace('\\', '/') for x in modules]
|
||||
modules.sort()
|
||||
|
||||
# Get all private files
|
||||
- privates = listdir(apath('%s/private/' % app, r=request), '[^\.#].*')
|
||||
+ privates = listdir(apath('%s/private/' % app, r=request), r'[^\.#].*')
|
||||
privates = [x.replace('\\', '/') for x in privates]
|
||||
privates.sort()
|
||||
|
||||
# Get all static files
|
||||
- statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*',
|
||||
+ statics = listdir(apath('%s/static/' % app, r=request), r'[^\.#].*',
|
||||
maxnum=MAXNFILES)
|
||||
statics = [x.replace(os.path.sep, '/') for x in statics]
|
||||
statics.sort()
|
||||
@@ -1267,7 +1267,7 @@ def plugin():
|
||||
redirect(URL('site'))
|
||||
|
||||
# Get all models
|
||||
- models = listdir(apath('%s/models/' % app, r=request), '.*\.py$')
|
||||
+ models = listdir(apath('%s/models/' % app, r=request), r'.*\.py$')
|
||||
models = [x.replace('\\', '/') for x in models]
|
||||
defines = {}
|
||||
for m in models:
|
||||
@@ -1277,7 +1277,7 @@ def plugin():
|
||||
|
||||
# Get all controllers
|
||||
controllers = sorted(
|
||||
- listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
|
||||
+ listdir(apath('%s/controllers/' % app, r=request), r'.*\.py$'))
|
||||
controllers = [x.replace('\\', '/') for x in controllers]
|
||||
functions = {}
|
||||
for c in controllers:
|
||||
@@ -1290,7 +1290,7 @@ def plugin():
|
||||
|
||||
# Get all views
|
||||
views = sorted(
|
||||
- listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$'))
|
||||
+ listdir(apath('%s/views/' % app, r=request), r'[\w/\-]+\.\w+$'))
|
||||
views = [x.replace('\\', '/') for x in views]
|
||||
extend = {}
|
||||
include = {}
|
||||
@@ -1304,17 +1304,17 @@ def plugin():
|
||||
include[c] = [i[1] for i in items]
|
||||
|
||||
# Get all modules
|
||||
- modules = listdir(apath('%s/modules/' % app, r=request), '.*\.py$')
|
||||
+ modules = listdir(apath('%s/modules/' % app, r=request), r'.*\.py$')
|
||||
modules = modules = [x.replace('\\', '/') for x in modules]
|
||||
modules.sort()
|
||||
|
||||
# Get all private files
|
||||
- privates = listdir(apath('%s/private/' % app, r=request), '[^\.#].*')
|
||||
+ privates = listdir(apath('%s/private/' % app, r=request), r'[^\.#].*')
|
||||
privates = [x.replace('\\', '/') for x in privates]
|
||||
privates.sort()
|
||||
|
||||
# Get all static files
|
||||
- statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*',
|
||||
+ statics = listdir(apath('%s/static/' % app, r=request), r'[^\.#].*',
|
||||
maxnum=MAXNFILES)
|
||||
statics = [x.replace(os.path.sep, '/') for x in statics]
|
||||
statics.sort()
|
||||
@@ -1331,7 +1331,7 @@ def plugin():
|
||||
safe_write(crontab, '#crontab')
|
||||
|
||||
def filter_plugins(items):
|
||||
- regex = re.compile('^plugin_' + plugin + '(/.*|\..*)?$')
|
||||
+ regex = re.compile(r'^plugin_' + plugin + r'(/.*|\..*)?$')
|
||||
return [item for item in items if item and regex.match(item)]
|
||||
|
||||
return dict(app=app,
|
||||
@@ -1363,14 +1363,14 @@ def create_file():
|
||||
request.vars.location += request.vars.dir + '/'
|
||||
app = get_app(name=request.vars.location.split('/')[0])
|
||||
path = apath(request.vars.location, r=request)
|
||||
- filename = re.sub('[^\w./-]+', '_', request.vars.filename)
|
||||
+ filename = re.sub(r'[^\w./-]+', '_', request.vars.filename)
|
||||
if path[-7:] == '/rules/':
|
||||
# Handle plural rules files
|
||||
if len(filename) == 0:
|
||||
raise SyntaxError
|
||||
if not filename[-3:] == '.py':
|
||||
filename += '.py'
|
||||
- lang = re.match('^plural_rules-(.*)\.py$', filename).group(1)
|
||||
+ lang = re.match(r'^plural_rules-(.*)\.py$', filename).group(1)
|
||||
langinfo = read_possible_languages(apath(app, r=request))[lang]
|
||||
text = dedent("""
|
||||
#!/usr/bin/env python
|
||||
@@ -1518,7 +1518,7 @@ def create_file():
|
||||
redirect(request.vars.sender + anchor)
|
||||
|
||||
|
||||
-def listfiles(app, dir, regexp='.*\.py$'):
|
||||
+def listfiles(app, dir, regexp=r'.*\.py$'):
|
||||
files = sorted(
|
||||
listdir(apath('%(app)s/%(dir)s/' % {'app': app, 'dir': dir}, r=request), regexp))
|
||||
files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')]
|
||||
@@ -1533,12 +1533,12 @@ def editfile(path, file, vars={}, app=None):
|
||||
|
||||
def files_menu():
|
||||
app = request.vars.app or 'welcome'
|
||||
- dirs = [{'name': 'models', 'reg': '.*\.py$'},
|
||||
- {'name': 'controllers', 'reg': '.*\.py$'},
|
||||
- {'name': 'views', 'reg': '[\w/\-]+(\.\w+)+$'},
|
||||
- {'name': 'modules', 'reg': '.*\.py$'},
|
||||
- {'name': 'static', 'reg': '[^\.#].*'},
|
||||
- {'name': 'private', 'reg': '.*\.py$'}]
|
||||
+ dirs = [{'name': 'models', 'reg': r'.*\.py$'},
|
||||
+ {'name': 'controllers', 'reg': r'.*\.py$'},
|
||||
+ {'name': 'views', 'reg': r'[\w/\-]+(\.\w+)+$'},
|
||||
+ {'name': 'modules', 'reg': r'.*\.py$'},
|
||||
+ {'name': 'static', 'reg': r'[^\.#].*'},
|
||||
+ {'name': 'private', 'reg': r'.*\.py$'}]
|
||||
result_files = []
|
||||
for dir in dirs:
|
||||
result_files.append(TAG[''](LI(dir['name'], _class="nav-header component", _onclick="collapse('" + dir['name'] + "_files');"),
|
||||
@@ -1559,7 +1559,7 @@ def upload_file():
|
||||
path = apath(request.vars.location, r=request)
|
||||
|
||||
if request.vars.filename:
|
||||
- filename = re.sub('[^\w\./]+', '_', request.vars.filename)
|
||||
+ filename = re.sub(r'[^\w\./]+', '_', request.vars.filename)
|
||||
else:
|
||||
filename = os.path.split(request.vars.file.filename)[-1]
|
||||
|
||||
@@ -1628,7 +1628,7 @@ def errors():
|
||||
|
||||
hash2error = dict()
|
||||
|
||||
- for fn in listdir(errors_path, '^[a-fA-F0-9.\-]+$'):
|
||||
+ for fn in listdir(errors_path, r'^[a-fA-F0-9.\-]+$'):
|
||||
fullpath = os.path.join(errors_path, fn)
|
||||
if not os.path.isfile(fullpath):
|
||||
continue
|
||||
@@ -1727,7 +1727,7 @@ def errors():
|
||||
func = lambda p: os.stat(apath('%s/errors/%s' %
|
||||
(app, p), r=request)).st_mtime
|
||||
tickets = sorted(
|
||||
- listdir(apath('%s/errors/' % app, r=request), '^\w.*'),
|
||||
+ listdir(apath('%s/errors/' % app, r=request), r'^\w.*'),
|
||||
key=func,
|
||||
reverse=True)
|
||||
|
||||
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
|
||||
index 45fa8a0e..be0446e1 100644
|
||||
--- a/gluon/compileapp.py
|
||||
+++ b/gluon/compileapp.py
|
||||
@@ -14,7 +14,7 @@ Note:
|
||||
|
||||
import copy
|
||||
import fnmatch
|
||||
-import imp
|
||||
+from importlib import import_module
|
||||
import marshal
|
||||
import os
|
||||
import py_compile
|
||||
@@ -345,7 +345,7 @@ def local_import_aux(name, reload_force=False, app="welcome"):
|
||||
"""
|
||||
items = name.replace("/", ".")
|
||||
name = "applications.%s.modules.%s" % (app, items)
|
||||
- module = __import__(name)
|
||||
+ module = import_module(name)
|
||||
for item in name.split(".")[1:]:
|
||||
module = getattr(module, item)
|
||||
if reload_force:
|
||||
diff --git a/gluon/contrib/appconfig.py b/gluon/contrib/appconfig.py
|
||||
index 1160e08a..2bf81841 100644
|
||||
--- a/gluon/contrib/appconfig.py
|
||||
+++ b/gluon/contrib/appconfig.py
|
||||
@@ -120,7 +120,7 @@ class AppConfigLoader(object):
|
||||
self.read_config()
|
||||
|
||||
def read_config_ini(self):
|
||||
- config = configparser.SafeConfigParser()
|
||||
+ config = configparser.RawConfigParser()
|
||||
config.read(self.file)
|
||||
settings = {}
|
||||
for section in config.sections():
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
config BR2_PACKAGE_PYTHON_WEB2PY
|
||||
bool "python-web2py"
|
||||
select BR2_PACKAGE_PYTHON_PYDAL # runtime
|
||||
select BR2_PACKAGE_PYTHON3_ZLIB # runtime
|
||||
select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
|
||||
select BR2_PACKAGE_PYTHON3_SQLITE # runtime
|
||||
select BR2_PACKAGE_PYTHON_YATL # runtime
|
||||
help
|
||||
web2py is a free open source full-stack framework for rapid
|
||||
development of fast, scalable, secure and portable
|
||||
database-driven web-based applications.
|
||||
|
||||
http://web2py.com
|
||||
|
||||
if BR2_PACKAGE_PYTHON_WEB2PY
|
||||
|
||||
config BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN
|
||||
bool "install admin panel application"
|
||||
default y
|
||||
select BR2_PACKAGE_HOST_PYTHON3
|
||||
# web2py will use pydal to generate the password (below), and that
|
||||
# uses hashlib.pbkdf2_hmac(), which is only available when python
|
||||
# is built with openssl since 3.12 (previously, there was a slow
|
||||
# pure-python fallback, dropped in 3.12).
|
||||
select BR2_PACKAGE_HOST_PYTHON3_SSL
|
||||
help
|
||||
This option install web2py admin panel application.
|
||||
It can be removed to save space on embedded systems.
|
||||
|
||||
if BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN
|
||||
|
||||
config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
|
||||
string "admin panel password"
|
||||
default "web2py"
|
||||
help
|
||||
Set the admin panel password.
|
||||
|
||||
endif
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,25 @@
|
||||
#!/bin/sh
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
printf "Starting web2py: "
|
||||
start-stop-daemon -S -q -m -p /run/web2py.pid \
|
||||
-c www-data \
|
||||
-b -x /var/www/web2py/web2py.py \
|
||||
-- --nogui -a '"<recycle>"' -i 0.0.0.0 -p 8000
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
printf "Stopping web2py: "
|
||||
start-stop-daemon -K -q -p /run/web2py.pid
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
restart)
|
||||
"$0" stop
|
||||
sleep 1
|
||||
"$0" start
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart}"
|
||||
;;
|
||||
esac
|
||||
@@ -0,0 +1,3 @@
|
||||
# sha256 locally computed
|
||||
sha256 d5d79f6260ec9f53f90447ad59313a8fac0571fce0018aa5f6fcf95d28c04382 python-web2py-2.26.1.tar.gz
|
||||
sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE
|
||||
@@ -0,0 +1,76 @@
|
||||
################################################################################
|
||||
#
|
||||
# python-web2py
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_WEB2PY_VERSION = 2.26.1
|
||||
PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION))
|
||||
PYTHON_WEB2PY_LICENSE = LGPL-3.0
|
||||
PYTHON_WEB2PY_LICENSE_FILES = LICENSE
|
||||
PYTHON_WEB2PY_CPE_ID_VENDOR = web2py
|
||||
PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py
|
||||
PYTHON_WEB2PY_DEPENDENCIES = host-python3 python3 \
|
||||
host-python-pydal host-python-yatl
|
||||
|
||||
PYTHON_WEB2PY_EXCLUSIONS = \
|
||||
welcome.w2p \
|
||||
applications/examples \
|
||||
applications/welcome \
|
||||
deposit \
|
||||
docs \
|
||||
examples \
|
||||
extras \
|
||||
handlers \
|
||||
scripts \
|
||||
ABOUT \
|
||||
anyserver.py \
|
||||
CHANGELOG \
|
||||
Makefile \
|
||||
MANIFEST.in \
|
||||
README.markdown \
|
||||
setup.py \
|
||||
tox.ini
|
||||
|
||||
define PYTHON_WEB2PY_GENERATE_PASSWORD
|
||||
$(HOST_DIR)/bin/python -c 'import os; \
|
||||
os.chdir("$(@D)"); \
|
||||
from gluon.main import save_password; \
|
||||
save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)'
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN),y)
|
||||
PYTHON_WEB2PY_POST_BUILD_HOOKS += PYTHON_WEB2PY_GENERATE_PASSWORD
|
||||
else
|
||||
PYTHON_WEB2PY_EXCLUSIONS += applications/admin
|
||||
endif
|
||||
|
||||
define PYTHON_WEB2PY_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/var/www/web2py
|
||||
rsync -a $(@D)/ $(TARGET_DIR)/var/www/web2py/ \
|
||||
$(addprefix --exclude=,$(PYTHON_WEB2PY_EXCLUSIONS))
|
||||
endef
|
||||
|
||||
define PYTHON_WEB2PY_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/python-web2py/S51web2py \
|
||||
$(TARGET_DIR)/etc/init.d/S51web2py
|
||||
endef
|
||||
|
||||
define PYTHON_WEB2PY_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 0644 package/python-web2py/web2py.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/web2py.service
|
||||
endef
|
||||
|
||||
# www-data user and group are used for web2py. Because these user and group
|
||||
# are already set by buildroot, it is not necessary to redefine them.
|
||||
# See system/skeleton/etc/passwd
|
||||
# username: www-data uid: 33
|
||||
# groupname: www-data gid: 33
|
||||
#
|
||||
# So, we just need to create the directories used by web2py with the right
|
||||
# ownership.
|
||||
define PYTHON_WEB2PY_PERMISSIONS
|
||||
/var/www/web2py r 750 33 33 - - - - -
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
@@ -0,0 +1,11 @@
|
||||
[Unit]
|
||||
Description=Web2py daemon
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/var/www/web2py/web2py.py --nogui -a '<recycle>' -i 0.0.0.0 -p 8000
|
||||
User=www-data
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Reference in New Issue
Block a user