Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python310 for openSUSE:Factory
checked in at 2023-03-15 18:52:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python310 (Old)
and /work/SRC/openSUSE:Factory/.python310.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python310"
Wed Mar 15 18:52:49 2023 rev:30 rq:1071070 version:3.10.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/python310/python310.changes 2023-03-05
20:07:49.588656905 +0100
+++ /work/SRC/openSUSE:Factory/.python310.new.31432/python310.changes
2023-03-15 18:52:50.319850717 +0100
@@ -1,0 +2,7 @@
+Mon Mar 13 08:39:53 UTC 2023 - Matej Cepl <mc...@suse.com>
+
+- Add invalid-json.patch fixing invalid JSON in
+ Doc/howto/logging-cookbook.rst (somehow similar to
+ gh#python/cpython#102582).
+
+-------------------------------------------------------------------
New:
----
invalid-json.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python310.spec ++++++
--- /var/tmp/diff_new_pack.Jhl8yh/_old 2023-03-15 18:52:51.239855611 +0100
+++ /var/tmp/diff_new_pack.Jhl8yh/_new 2023-03-15 18:52:51.243855632 +0100
@@ -170,6 +170,9 @@
# blocklist bypass via the urllib.parse component when supplying
# a URL that starts with blank characters
Patch37: CVE-2023-24329-blank-URL-bypass.patch
+# PATCH-FIX-UPSTREAM invalid-json.patch gh#python/cpython#102582 mc...@suse.com
+# We require valid JSON in documentation
+Patch38: invalid-json.patch
BuildRequires: autoconf-archive
BuildRequires: automake
BuildRequires: fdupes
@@ -443,6 +446,7 @@
%patch35 -p1
%patch36 -p1
%patch37 -p1
+%patch38 -p1
# drop Autoconf version requirement
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
++++++ invalid-json.patch ++++++
---
Doc/howto/logging-cookbook.rst | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -340,10 +340,12 @@ adding a ``filters`` section parallel to
.. code-block:: json
- "filters": {
- "warnings_and_below": {
- "()" : "__main__.filter_maker",
- "level": "WARNING"
+ {
+ "filters": {
+ "warnings_and_below": {
+ "()" : "__main__.filter_maker",
+ "level": "WARNING"
+ }
}
}
@@ -351,12 +353,14 @@ and changing the section on the ``stdout
.. code-block:: json
- "stdout": {
- "class": "logging.StreamHandler",
- "level": "INFO",
- "formatter": "simple",
- "stream": "ext://sys.stdout",
- "filters": ["warnings_and_below"]
+ {
+ "stdout": {
+ "class": "logging.StreamHandler",
+ "level": "INFO",
+ "formatter": "simple",
+ "stream": "ext://sys.stdout",
+ "filters": ["warnings_and_below"]
+ }
}
A filter is just a function, so we can define the ``filter_maker`` (a factory
