From 972769d49c03f232517aa6adf5f7896787bee0f4 Mon Sep 17 00:00:00 2001 From: zhang-liang-pengkun Date: Wed, 28 Feb 2024 11:51:02 +0800 Subject: [PATCH] fix: view decorator does not forward default values if route result is None Signed-off-by: zhang-liang-pengkun --- ...or-does-not-forward-default-values-i.patch | 26 +++++++++++++++++++ python-bottle.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0013-fix-view-decorator-does-not-forward-default-values-i.patch diff --git a/0013-fix-view-decorator-does-not-forward-default-values-i.patch b/0013-fix-view-decorator-does-not-forward-default-values-i.patch new file mode 100644 index 0000000..2770867 --- /dev/null +++ b/0013-fix-view-decorator-does-not-forward-default-values-i.patch @@ -0,0 +1,26 @@ +From ef7b678bda31b9d5c3f7f4cffcdcf14137b4cdad Mon Sep 17 00:00:00 2001 +From: Marcel Hellkamp +Date: Sun, 12 Jun 2022 20:54:46 +0200 +Subject: [PATCH] fix: view decorator does not forward default values if route + result is None + +--- + bottle.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bottle.py b/bottle.py +index 2266801..ed3076c 100644 +--- a/bottle.py ++++ b/bottle.py +@@ -3682,7 +3682,7 @@ def view(tpl_name, **defaults): + tplvars.update(result) + return template(tpl_name, **tplvars) + elif result is None: +- return template(tpl_name, defaults) ++ return template(tpl_name, **defaults) + return result + return wrapper + return decorator +-- +2.39.0.windows.2 + diff --git a/python-bottle.spec b/python-bottle.spec index e932c02..b025e01 100644 --- a/python-bottle.spec +++ b/python-bottle.spec @@ -1,6 +1,6 @@ Name: python-bottle Version: 0.12.13 -Release: 22 +Release: 23 Summary: WSGI micro web-framework for Python. License: MIT URL: https://github.com/bottlepy/bottle @@ -20,6 +20,7 @@ Patch0010: 0009-Fix-for-Issue-586.patch Patch0011: 0010-Add-ServerAdapter-for-CherryPy-9.patch Patch0012: 0011-Added-cheroot-server-adapter-to-list-of-server-names.patch Patch0013: 0012-fix-Cookie-test-falsely-reports-a-failure-for-some-p.patch +Patch0014: 0013-fix-view-decorator-does-not-forward-default-values-i.patch BuildArch: noarch BuildRequires: python3-devel python3-setuptools @@ -57,6 +58,9 @@ sed -i '/^#!/d' bottle.py %exclude %{_bindir}/bottle.py %changelog +* Wed Feb 28 2024 zhangliangpengkun - 0.12.13-23 +- fix: view decorator does not forward default values if route result is None + * Tue Jan 30 2024 zhangliangpengkun - 0.12.13-22 - fix: Cookie test falsely reports a failure for some python versions. -- Gitee