openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2022
- 1 participants
- 2423 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-requests for openSUSE:Factory checked in at 2022-11-01 13:41:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-requests (Old)
and /work/SRC/openSUSE:Factory/.python-requests.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-requests"
Tue Nov 1 13:41:01 2022 rev:75 rq:1032440 version:2.28.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-requests/python-requests.changes 2022-10-10 18:43:20.790711611 +0200
+++ /work/SRC/openSUSE:Factory/.python-requests.new.2275/python-requests.changes 2022-11-01 13:41:08.899442865 +0100
@@ -1,0 +2,6 @@
+Mon Oct 31 07:43:29 UTC 2022 - David Anes <david.anes(a)suse.com>
+
+- allow using newest version of charset-normalizer (3.0+)
+ * requests-allow-charset-normalizer-3.patch
+
+-------------------------------------------------------------------
New:
----
requests-allow-charset-normalizer-3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-requests.spec ++++++
--- /var/tmp/diff_new_pack.qmaac8/_old 2022-11-01 13:41:09.491446014 +0100
+++ /var/tmp/diff_new_pack.qmaac8/_new 2022-11-01 13:41:09.495446035 +0100
@@ -35,6 +35,9 @@
Source: https://files.pythonhosted.org/packages/source/r/requests/requests-%{versio…
# PATCH-FIX-SUSE: do not hardcode versions in setup.py/requirements
Patch0: requests-no-hardcoded-version.patch
+# PATCH-FIX-UPSTREAN: Allow charset normalizer >=2 and <4
+# - https://github.com/psf/requests/commit/c57f1f0ca10e61771b459c857182c2362660…
+Patch1: requests-allow-charset-normalizer-3.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
++++++ requests-allow-charset-normalizer-3.patch ++++++
From c57f1f0ca10e61771b459c857182c23626607312 Mon Sep 17 00:00:00 2001
From: deedy5 <65482418+deedy5(a)users.noreply.github.com>
Date: Thu, 20 Oct 2022 18:26:18 +0000
Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261)
---
requests/__init__.py | 4 ++--
setup.cfg | 2 +-
setup.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Index: requests-2.28.1/requests/__init__.py
===================================================================
--- requests-2.28.1.orig/requests/__init__.py
+++ requests-2.28.1/requests/__init__.py
@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version,
elif charset_normalizer_version:
major, minor, patch = charset_normalizer_version.split(".")[:3]
major, minor, patch = int(major), int(minor), int(patch)
- # charset_normalizer >= 2.0.0 < 3.0.0
- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0)
+ # charset_normalizer >= 2.0.0 < 4.0.0
+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
else:
raise Exception("You need either charset_normalizer or chardet installed")
Index: requests-2.28.1/setup.cfg
===================================================================
--- requests-2.28.1.orig/setup.cfg
+++ requests-2.28.1/setup.cfg
@@ -5,7 +5,7 @@ provides-extra =
use_chardet_on_py3
requires-dist =
certifi>=2017.4.17
- charset_normalizer>=2,<3
+ charset_normalizer>=2,<4
idna>=2.5,<4
urllib3>=1.21.1,<1.27
Index: requests-2.28.1/setup.py
===================================================================
--- requests-2.28.1.orig/setup.py
+++ requests-2.28.1/setup.py
@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish":
sys.exit()
requires = [
- "charset_normalizer>=2,<3",
+ "charset_normalizer>=2,<4",
"idna>=2.5,<4",
"urllib3>=1.21.1,<1.27",
"certifi>=2017.4.17",
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytz for openSUSE:Factory checked in at 2022-11-01 13:40:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytz (Old)
and /work/SRC/openSUSE:Factory/.python-pytz.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytz"
Tue Nov 1 13:40:59 2022 rev:48 rq:1032439 version:2022.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytz/python-pytz.changes 2022-10-18 12:44:54.417711042 +0200
+++ /work/SRC/openSUSE:Factory/.python-pytz.new.2275/python-pytz.changes 2022-11-01 13:41:06.983432672 +0100
@@ -1,0 +2,15 @@
+Fri Oct 28 20:55:25 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com>
+
+- Update to 2022.5
+
+ * IANA 2022e
+ Squashed 'tz/' changes from 0fc8f915a..16bd7a384
+ c4eb3fcf2 Release 2022e
+ 842ad565d Add Jordan URL from Brian Inglis
+ 3aa74b7f7 Jordan to switch from +02/+03 with DST to plain +03
+ 59aa97e8e Syria to switch from +02/+03 with DST to plain +03
+ f29068291 Prefer UT for whole-hour UT transitions
+ 7f860c0fe Circa-1922 Mexico fixes
+ ff2e2a09a Treat 1931 changes in Mexico as DST
+
+-------------------------------------------------------------------
Old:
----
pytz-2022.4.tar.gz
pytz-2022.4.tar.gz.asc
New:
----
pytz-2022.5.tar.gz
pytz-2022.5.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytz.spec ++++++
--- /var/tmp/diff_new_pack.H5BHvY/_old 2022-11-01 13:41:08.459440524 +0100
+++ /var/tmp/diff_new_pack.H5BHvY/_new 2022-11-01 13:41:08.463440545 +0100
@@ -29,7 +29,7 @@
} }
Name: python-pytz
-Version: 2022.4
+Version: 2022.5
Release: 0
Summary: World timezone definitions, modern and historical
License: MIT
++++++ pytz-2022.4.tar.gz -> pytz-2022.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2022.4/PKG-INFO new/pytz-2022.5/PKG-INFO
--- old/pytz-2022.4/PKG-INFO 2022-10-02 07:04:12.740481100 +0200
+++ new/pytz-2022.5/PKG-INFO 2022-10-18 13:30:20.857716000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: pytz
-Version: 2022.4
+Version: 2022.5
Summary: World timezone definitions, modern and historical
Home-page: http://pythonhosted.org/pytz
Author: Stuart Bishop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2022.4/pytz/__init__.py new/pytz-2022.5/pytz/__init__.py
--- old/pytz-2022.4/pytz/__init__.py 2022-10-02 06:54:19.000000000 +0200
+++ new/pytz-2022.5/pytz/__init__.py 2022-10-18 13:30:15.000000000 +0200
@@ -22,8 +22,8 @@
# The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2022d'
-VERSION = '2022.4' # pip compatible version number.
+OLSON_VERSION = '2022e'
+VERSION = '2022.5' # pip compatible version number.
__version__ = VERSION
OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2022.4/pytz/tests/test_tzinfo.py new/pytz-2022.5/pytz/tests/test_tzinfo.py
--- old/pytz-2022.4/pytz/tests/test_tzinfo.py 2022-10-02 06:54:19.000000000 +0200
+++ new/pytz-2022.5/pytz/tests/test_tzinfo.py 2022-10-18 13:30:15.000000000 +0200
@@ -27,8 +27,8 @@
# I test for expected version to ensure the correct version of pytz is
# actually being tested.
-EXPECTED_VERSION = '2022.4'
-EXPECTED_OLSON_VERSION = '2022d'
+EXPECTED_VERSION = '2022.5'
+EXPECTED_OLSON_VERSION = '2022e'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'
Binary files old/pytz-2022.4/pytz/zoneinfo/Africa/Ceuta and new/pytz-2022.5/pytz/zoneinfo/Africa/Ceuta differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Bahia_Banderas and new/pytz-2022.5/pytz/zoneinfo/America/Bahia_Banderas differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Boise and new/pytz-2022.5/pytz/zoneinfo/America/Boise differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Cancun and new/pytz-2022.5/pytz/zoneinfo/America/Cancun differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Chicago and new/pytz-2022.5/pytz/zoneinfo/America/Chicago differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Chihuahua and new/pytz-2022.5/pytz/zoneinfo/America/Chihuahua differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Creston and new/pytz-2022.5/pytz/zoneinfo/America/Creston differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Denver and new/pytz-2022.5/pytz/zoneinfo/America/Denver differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Ensenada and new/pytz-2022.5/pytz/zoneinfo/America/Ensenada differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Fort_Wayne and new/pytz-2022.5/pytz/zoneinfo/America/Fort_Wayne differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Hermosillo and new/pytz-2022.5/pytz/zoneinfo/America/Hermosillo differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Indianapolis and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Indianapolis differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Knox and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Knox differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Marengo and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Marengo differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Petersburg and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Petersburg differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Tell_City and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Tell_City differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Vevay and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Vevay differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Vincennes and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Vincennes differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indiana/Winamac and new/pytz-2022.5/pytz/zoneinfo/America/Indiana/Winamac differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Indianapolis and new/pytz-2022.5/pytz/zoneinfo/America/Indianapolis differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Kentucky/Louisville and new/pytz-2022.5/pytz/zoneinfo/America/Kentucky/Louisville differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Kentucky/Monticello and new/pytz-2022.5/pytz/zoneinfo/America/Kentucky/Monticello differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Knox_IN and new/pytz-2022.5/pytz/zoneinfo/America/Knox_IN differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Los_Angeles and new/pytz-2022.5/pytz/zoneinfo/America/Los_Angeles differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Louisville and new/pytz-2022.5/pytz/zoneinfo/America/Louisville differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Matamoros and new/pytz-2022.5/pytz/zoneinfo/America/Matamoros differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Mazatlan and new/pytz-2022.5/pytz/zoneinfo/America/Mazatlan differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Merida and new/pytz-2022.5/pytz/zoneinfo/America/Merida differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Mexico_City and new/pytz-2022.5/pytz/zoneinfo/America/Mexico_City differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Monterrey and new/pytz-2022.5/pytz/zoneinfo/America/Monterrey differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/North_Dakota/Beulah and new/pytz-2022.5/pytz/zoneinfo/America/North_Dakota/Beulah differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/North_Dakota/Center and new/pytz-2022.5/pytz/zoneinfo/America/North_Dakota/Center differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/North_Dakota/New_Salem and new/pytz-2022.5/pytz/zoneinfo/America/North_Dakota/New_Salem differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Ojinaga and new/pytz-2022.5/pytz/zoneinfo/America/Ojinaga differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Phoenix and new/pytz-2022.5/pytz/zoneinfo/America/Phoenix differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Santa_Isabel and new/pytz-2022.5/pytz/zoneinfo/America/Santa_Isabel differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Shiprock and new/pytz-2022.5/pytz/zoneinfo/America/Shiprock differ
Binary files old/pytz-2022.4/pytz/zoneinfo/America/Tijuana and new/pytz-2022.5/pytz/zoneinfo/America/Tijuana differ
Binary files old/pytz-2022.4/pytz/zoneinfo/Asia/Amman and new/pytz-2022.5/pytz/zoneinfo/Asia/Amman differ
Binary files old/pytz-2022.4/pytz/zoneinfo/Asia/Damascus and new/pytz-2022.5/pytz/zoneinfo/Asia/Damascus differ
Binary files old/pytz-2022.4/pytz/zoneinfo/Mexico/BajaNorte and new/pytz-2022.5/pytz/zoneinfo/Mexico/BajaNorte differ
Binary files old/pytz-2022.4/pytz/zoneinfo/Mexico/BajaSur and new/pytz-2022.5/pytz/zoneinfo/Mexico/BajaSur differ
Binary files old/pytz-2022.4/pytz/zoneinfo/Mexico/General and new/pytz-2022.5/pytz/zoneinfo/Mexico/General differ
Binary files old/pytz-2022.4/pytz/zoneinfo/Navajo and new/pytz-2022.5/pytz/zoneinfo/Navajo differ
Binary files old/pytz-2022.4/pytz/zoneinfo/US/Arizona and new/pytz-2022.5/pytz/zoneinfo/US/Arizona differ
Binary files old/pytz-2022.4/pytz/zoneinfo/US/Central and new/pytz-2022.5/pytz/zoneinfo/US/Central differ
Binary files old/pytz-2022.4/pytz/zoneinfo/US/East-Indiana and new/pytz-2022.5/pytz/zoneinfo/US/East-Indiana differ
Binary files old/pytz-2022.4/pytz/zoneinfo/US/Indiana-Starke and new/pytz-2022.5/pytz/zoneinfo/US/Indiana-Starke differ
Binary files old/pytz-2022.4/pytz/zoneinfo/US/Mountain and new/pytz-2022.5/pytz/zoneinfo/US/Mountain differ
Binary files old/pytz-2022.4/pytz/zoneinfo/US/Pacific and new/pytz-2022.5/pytz/zoneinfo/US/Pacific differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2022.4/pytz/zoneinfo/tzdata.zi new/pytz-2022.5/pytz/zoneinfo/tzdata.zi
--- old/pytz-2022.4/pytz/zoneinfo/tzdata.zi 2022-10-02 06:54:16.000000000 +0200
+++ new/pytz-2022.5/pytz/zoneinfo/tzdata.zi 2022-10-18 13:30:13.000000000 +0200
@@ -833,10 +833,11 @@
R J 2006 2011 - O lastF 0s 0 -
R J 2013 o - D 20 0 0 -
R J 2014 2021 - Mar lastTh 24 1 S
-R J 2014 ma - O lastF 0s 0 -
-R J 2022 ma - F lastTh 24 1 S
+R J 2014 2022 - O lastF 0s 0 -
+R J 2022 o - F lastTh 24 1 S
Z Asia/Amman 2:23:44 - LMT 1931
-2 J EE%sT
+2 J EE%sT 2022 O 28 0s
+3 - +03
Z Asia/Almaty 5:7:48 - LMT 1924 May 2
5 - +05 1930 Jun 21
6 R +06/+07 1991 Mar 31 2s
@@ -1137,10 +1138,11 @@
R S 2008 o - N 1 0 0 -
R S 2009 o - Mar lastF 0 1 S
R S 2010 2011 - Ap F>=1 0 1 S
-R S 2012 ma - Mar lastF 0 1 S
-R S 2009 ma - O lastF 0 0 -
+R S 2012 2022 - Mar lastF 0 1 S
+R S 2009 2022 - O lastF 0 0 -
Z Asia/Damascus 2:25:12 - LMT 1920
-2 S EE%sT
+2 S EE%sT 2022 O 28
+3 - +03
Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
5 - +05 1930 Jun 21
6 R +06/+07 1991 Mar 31 2s
@@ -2493,7 +2495,7 @@
0 s WE%sT 1940 Mar 16 23
1 s CE%sT 1979
1 E CE%sT
-Z Africa/Ceuta -0:21:16 - LMT 1900 D 31 23:38:44
+Z Africa/Ceuta -0:21:16 - LMT 1901 Ja 1 0u
0 - WET 1918 May 6 23
0 1 WEST 1918 O 7 23
0 - WET 1924
@@ -2620,7 +2622,7 @@
R Ch 1922 1966 - Ap lastSu 2 1 D
R Ch 1922 1954 - S lastSu 2 0 S
R Ch 1955 1966 - O lastSu 2 0 S
-Z America/Chicago -5:50:36 - LMT 1883 N 18 12:9:24
+Z America/Chicago -5:50:36 - LMT 1883 N 18 18u
-6 u C%sT 1920
-6 Ch C%sT 1936 Mar 1 2
-5 - EST 1936 N 15 2
@@ -2628,13 +2630,13 @@
-6 u C%sT 1946
-6 Ch C%sT 1967
-6 u C%sT
-Z America/North_Dakota/Center -6:45:12 - LMT 1883 N 18 12:14:48
+Z America/North_Dakota/Center -6:45:12 - LMT 1883 N 18 19u
-7 u M%sT 1992 O 25 2
-6 u C%sT
-Z America/North_Dakota/New_Salem -6:45:39 - LMT 1883 N 18 12:14:21
+Z America/North_Dakota/New_Salem -6:45:39 - LMT 1883 N 18 19u
-7 u M%sT 2003 O 26 2
-6 u C%sT
-Z America/North_Dakota/Beulah -6:47:7 - LMT 1883 N 18 12:12:53
+Z America/North_Dakota/Beulah -6:47:7 - LMT 1883 N 18 19u
-7 u M%sT 2010 N 7 2
-6 u C%sT
R De 1920 1921 - Mar lastSu 2 1 D
@@ -2642,7 +2644,7 @@
R De 1921 o - May 22 2 0 S
R De 1965 1966 - Ap lastSu 2 1 D
R De 1965 1966 - O lastSu 2 0 S
-Z America/Denver -6:59:56 - LMT 1883 N 18 12:0:4
+Z America/Denver -6:59:56 - LMT 1883 N 18 19u
-7 u M%sT 1920
-7 De M%sT 1942
-7 u M%sT 1946
@@ -2653,7 +2655,7 @@
R CA 1950 1966 - Ap lastSu 1 1 D
R CA 1950 1961 - S lastSu 2 0 S
R CA 1962 1966 - O lastSu 2 0 S
-Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 12:7:2
+Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 20u
-8 u P%sT 1946
-8 CA P%sT 1967
-8 u P%sT
@@ -2723,7 +2725,7 @@
-10:30 1 HDT 1933 May 21 12
-10:30 u H%sT 1947 Jun 8 2
-10 - HST
-Z America/Phoenix -7:28:18 - LMT 1883 N 18 11:31:42
+Z America/Phoenix -7:28:18 - LMT 1883 N 18 19u
-7 u M%sT 1944 Ja 1 0:1
-7 - MST 1944 Ap 1 0:1
-7 u M%sT 1944 O 1 0:1
@@ -2731,7 +2733,7 @@
-7 u M%sT 1968 Mar 21
-7 - MST
L America/Phoenix America/Creston
-Z America/Boise -7:44:49 - LMT 1883 N 18 12:15:11
+Z America/Boise -7:44:49 - LMT 1883 N 18 20u
-8 u P%sT 1923 May 13 2
-7 u M%sT 1974
-7 - MST 1974 F 3 2
@@ -2739,7 +2741,7 @@
R In 1941 o - Jun 22 2 1 D
R In 1941 1954 - S lastSu 2 0 S
R In 1946 1954 - Ap lastSu 2 1 D
-Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 12:15:22
+Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 18u
-6 u C%sT 1920
-6 In C%sT 1942
-6 u C%sT 1946
@@ -2754,7 +2756,7 @@
R Ma 1951 o - S lastSu 2 0 S
R Ma 1954 1960 - Ap lastSu 2 1 D
R Ma 1954 1960 - S lastSu 2 0 S
-Z America/Indiana/Marengo -5:45:23 - LMT 1883 N 18 12:14:37
+Z America/Indiana/Marengo -5:45:23 - LMT 1883 N 18 18u
-6 u C%sT 1951
-6 Ma C%sT 1961 Ap 30 2
-5 - EST 1969
@@ -2772,7 +2774,7 @@
R V 1960 o - O lastSu 2 0 S
R V 1961 o - S lastSu 2 0 S
R V 1962 1963 - O lastSu 2 0 S
-Z America/Indiana/Vincennes -5:50:7 - LMT 1883 N 18 12:9:53
+Z America/Indiana/Vincennes -5:50:7 - LMT 1883 N 18 18u
-6 u C%sT 1946
-6 V C%sT 1964 Ap 26 2
-5 - EST 1969
@@ -2784,7 +2786,7 @@
R Pe 1955 1960 - S lastSu 2 0 S
R Pe 1956 1963 - Ap lastSu 2 1 D
R Pe 1961 1963 - O lastSu 2 0 S
-Z America/Indiana/Tell_City -5:47:3 - LMT 1883 N 18 12:12:57
+Z America/Indiana/Tell_City -5:47:3 - LMT 1883 N 18 18u
-6 u C%sT 1946
-6 Pe C%sT 1964 Ap 26 2
-5 - EST 1967 O 29 2
@@ -2796,7 +2798,7 @@
R Pi 1955 1960 - S lastSu 2 0 S
R Pi 1956 1964 - Ap lastSu 2 1 D
R Pi 1961 1964 - O lastSu 2 0 S
-Z America/Indiana/Petersburg -5:49:7 - LMT 1883 N 18 12:10:53
+Z America/Indiana/Petersburg -5:49:7 - LMT 1883 N 18 18u
-6 u C%sT 1955
-6 Pi C%sT 1965 Ap 25 2
-5 - EST 1966 O 30 2
@@ -2809,7 +2811,7 @@
R St 1955 1956 - O lastSu 2 0 S
R St 1957 1958 - S lastSu 2 0 S
R St 1959 1961 - O lastSu 2 0 S
-Z America/Indiana/Knox -5:46:30 - LMT 1883 N 18 12:13:30
+Z America/Indiana/Knox -5:46:30 - LMT 1883 N 18 18u
-6 u C%sT 1947
-6 St C%sT 1962 Ap 29 2
-5 - EST 1963 O 27 2
@@ -2820,7 +2822,7 @@
R Pu 1946 1954 - S lastSu 2 0 S
R Pu 1955 1956 - O lastSu 2 0 S
R Pu 1957 1960 - S lastSu 2 0 S
-Z America/Indiana/Winamac -5:46:25 - LMT 1883 N 18 12:13:35
+Z America/Indiana/Winamac -5:46:25 - LMT 1883 N 18 18u
-6 u C%sT 1946
-6 Pu C%sT 1961 Ap 30 2
-5 - EST 1969
@@ -2828,7 +2830,7 @@
-5 - EST 2006 Ap 2 2
-6 u C%sT 2007 Mar 11 2
-5 u E%sT
-Z America/Indiana/Vevay -5:40:16 - LMT 1883 N 18 12:19:44
+Z America/Indiana/Vevay -5:40:16 - LMT 1883 N 18 18u
-6 u C%sT 1954 Ap 25 2
-5 - EST 1969
-5 u E%sT 1973
@@ -2843,7 +2845,7 @@
R v 1950 1961 - Ap lastSu 2 1 D
R v 1950 1955 - S lastSu 2 0 S
R v 1956 1961 - O lastSu 2 0 S
-Z America/Kentucky/Louisville -5:43:2 - LMT 1883 N 18 12:16:58
+Z America/Kentucky/Louisville -5:43:2 - LMT 1883 N 18 18u
-6 u C%sT 1921
-6 v C%sT 1942
-6 u C%sT 1946
@@ -2852,7 +2854,7 @@
-5 u E%sT 1974 Ja 6 2
-6 1 CDT 1974 O 27 2
-5 u E%sT
-Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 12:20:36
+Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 18u
-6 u C%sT 1946
-6 - CST 1968
-6 u C%sT 2000 O 29 2
@@ -3194,6 +3196,8 @@
-8 Y P%sT 1980
-8 C P%sT 2020 N
-7 - MST
+R m 1931 o - May 1 23 1 D
+R m 1931 o - O 1 0 0 S
R m 1939 o - F 5 0 1 D
R m 1939 o - Jun 25 0 0 S
R m 1940 o - D 9 0 1 D
@@ -3208,87 +3212,75 @@
R m 2001 o - S lastSu 2 0 S
R m 2002 ma - Ap Su>=1 2 1 D
R m 2002 ma - O lastSu 2 0 S
-Z America/Cancun -5:47:4 - LMT 1922 Ja 1 0:12:56
+Z America/Cancun -5:47:4 - LMT 1922 Ja 1 6u
-6 - CST 1981 D 23
-5 m E%sT 1998 Au 2 2
-6 m C%sT 2015 F 1 2
-5 - EST
-Z America/Merida -5:58:28 - LMT 1922 Ja 1 0:1:32
+Z America/Merida -5:58:28 - LMT 1922 Ja 1 6u
-6 - CST 1981 D 23
-5 - EST 1982 D 2
-6 m C%sT
-Z America/Matamoros -6:40 - LMT 1921 D 31 23:20
+Z America/Matamoros -6:30 - LMT 1922 Ja 1 6u
-6 - CST 1988
-6 u C%sT 1989
-6 m C%sT 2010
-6 u C%sT
-Z America/Monterrey -6:41:16 - LMT 1921 D 31 23:18:44
+Z America/Monterrey -6:41:16 - LMT 1922 Ja 1 6u
-6 - CST 1988
-6 u C%sT 1989
-6 m C%sT
-Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 0:23:24
+Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 7u
-7 - MST 1927 Jun 10 23
-6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
+-7 m M%sT 1932 Ap
-6 m C%sT 2001 S 30 2
-6 - CST 2002 F 20
-6 m C%sT
-Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 0:2:20
+Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 7u
-7 - MST 1927 Jun 10 23
-6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
+-7 m M%sT 1932 Ap
-6 - CST 1996
-6 m C%sT 1998
-6 - CST 1998 Ap Su>=1 3
-7 m M%sT 2010
-7 u M%sT
-Z America/Chihuahua -7:4:20 - LMT 1921 D 31 23:55:40
+Z America/Chihuahua -7:4:20 - LMT 1922 Ja 1 7u
-7 - MST 1927 Jun 10 23
-6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
+-7 m M%sT 1932 Ap
-6 - CST 1996
-6 m C%sT 1998
-6 - CST 1998 Ap Su>=1 3
-7 m M%sT
-Z America/Hermosillo -7:23:52 - LMT 1921 D 31 23:36:8
+Z America/Hermosillo -7:23:52 - LMT 1922 Ja 1 7u
-7 - MST 1927 Jun 10 23
-6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
+-7 m M%sT 1932 Ap
-6 - CST 1942 Ap 24
-7 - MST 1949 Ja 14
-8 - PST 1970
-7 m M%sT 1999
-7 - MST
-Z America/Mazatlan -7:5:40 - LMT 1921 D 31 23:54:20
+Z America/Mazatlan -7:5:40 - LMT 1922 Ja 1 7u
-7 - MST 1927 Jun 10 23
-6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
+-7 m M%sT 1932 Ap
-6 - CST 1942 Ap 24
-7 - MST 1949 Ja 14
-8 - PST 1970
-7 m M%sT
-Z America/Bahia_Banderas -7:1 - LMT 1921 D 31 23:59
+Z America/Bahia_Banderas -7:1 - LMT 1922 Ja 1 7u
-7 - MST 1927 Jun 10 23
-6 - CST 1930 N 15
--7 - MST 1931 May 1 23
--6 - CST 1931 O
--7 - MST 1932 Ap
+-7 m M%sT 1932 Ap
-6 - CST 1942 Ap 24
-7 - MST 1949 Ja 14
-8 - PST 1970
-7 m M%sT 2010 Ap 4 2
-6 m C%sT
-Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 0:11:56
+Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 7u
-7 - MST 1924
-8 - PST 1927 Jun 10 23
-7 - MST 1930 N 15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2022.4/pytz.egg-info/PKG-INFO new/pytz-2022.5/pytz.egg-info/PKG-INFO
--- old/pytz-2022.4/pytz.egg-info/PKG-INFO 2022-10-02 07:04:12.000000000 +0200
+++ new/pytz-2022.5/pytz.egg-info/PKG-INFO 2022-10-18 13:30:20.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: pytz
-Version: 2022.4
+Version: 2022.5
Summary: World timezone definitions, modern and historical
Home-page: http://pythonhosted.org/pytz
Author: Stuart Bishop
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-tinycss2 for openSUSE:Factory checked in at 2022-11-01 13:40:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-tinycss2 (Old)
and /work/SRC/openSUSE:Factory/.python-tinycss2.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tinycss2"
Tue Nov 1 13:40:56 2022 rev:10 rq:1032436 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-tinycss2/python-tinycss2.changes 2022-08-20 20:27:37.765180651 +0200
+++ /work/SRC/openSUSE:Factory/.python-tinycss2.new.2275/python-tinycss2.changes 2022-11-01 13:41:05.139422862 +0100
@@ -1,0 +2,9 @@
+Sat Oct 29 16:06:46 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com>
+
+- Update to 1.2.1
+ * Fix tests included in the source tarball
+ * Drop support of Python 3.6
+ * Fix serialization of nested functions with no parameters
+ * Don���t use pytest plugins by default
+
+-------------------------------------------------------------------
Old:
----
tinycss2-1.1.1.tar.gz
New:
----
tinycss2-1.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-tinycss2.spec ++++++
--- /var/tmp/diff_new_pack.ne6v0L/_old 2022-11-01 13:41:05.831426543 +0100
+++ /var/tmp/diff_new_pack.ne6v0L/_new 2022-11-01 13:41:05.839426586 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-tinycss2
-Version: 1.1.1
+Version: 1.2.1
Release: 0
Summary: Low-level CSS parser for Python
License: BSD-3-Clause
++++++ tinycss2-1.1.1.tar.gz -> tinycss2-1.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/PKG-INFO new/tinycss2-1.2.1/PKG-INFO
--- old/tinycss2-1.1.1/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
+++ new/tinycss2-1.2.1/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +1,11 @@
Metadata-Version: 2.1
Name: tinycss2
-Version: 1.1.1
+Version: 1.2.1
Summary: A tiny CSS parser
Keywords: css,parser
Author-email: Simon Sapin <simon.sapin(a)exyr.org>
Maintainer-email: CourtBouillon <contact(a)courtbouillon.org>
-Requires-Python: >=3.6
+Requires-Python: >=3.7
Description-Content-Type: text/x-rst
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
@@ -14,7 +14,6 @@
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
@@ -26,10 +25,8 @@
Requires-Dist: sphinx ; extra == "doc"
Requires-Dist: sphinx_rtd_theme ; extra == "doc"
Requires-Dist: pytest ; extra == "test"
-Requires-Dist: pytest-cov ; extra == "test"
-Requires-Dist: pytest-flake8 ; extra == "test"
-Requires-Dist: pytest-isort ; extra == "test"
-Requires-Dist: coverage[toml] ; extra == "test"
+Requires-Dist: isort ; extra == "test"
+Requires-Dist: flake8 ; extra == "test"
Project-URL: Changelog, https://github.com/Kozea/tinycss2/releases
Project-URL: Code, https://github.com/Kozea/tinycss2/
Project-URL: Documentation, https://doc.courtbouillon.org/tinycss2/
@@ -48,7 +45,7 @@
CSS modules.
* Free software: BSD license
-* For Python 3.6+, tested on CPython and PyPy
+* For Python 3.7+, tested on CPython and PyPy
* Documentation: https://doc.courtbouillon.org/tinycss2
* Changelog: https://github.com/Kozea/tinycss2/releases
* Code, issues, tests: https://github.com/Kozea/tinycss2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/README.rst new/tinycss2-1.2.1/README.rst
--- old/tinycss2-1.1.1/README.rst 2020-10-30 21:31:41.489813800 +0100
+++ new/tinycss2-1.2.1/README.rst 2022-05-27 18:25:35.352110900 +0200
@@ -7,7 +7,7 @@
CSS modules.
* Free software: BSD license
-* For Python 3.6+, tested on CPython and PyPy
+* For Python 3.7+, tested on CPython and PyPy
* Documentation: https://doc.courtbouillon.org/tinycss2
* Changelog: https://github.com/Kozea/tinycss2/releases
* Code, issues, tests: https://github.com/Kozea/tinycss2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/docs/changelog.rst new/tinycss2-1.2.1/docs/changelog.rst
--- old/tinycss2-1.1.1/docs/changelog.rst 2021-11-22 18:52:48.539322000 +0100
+++ new/tinycss2-1.2.1/docs/changelog.rst 2022-10-18 09:02:14.044229300 +0200
@@ -2,6 +2,24 @@
=========
+Version 1.2.1
+-------------
+
+Released on 2022-10-18.
+
+* Fix tests included in the source tarball
+
+
+Version 1.2.0
+-------------
+
+Released on 2022-10-17.
+
+* Drop support of Python 3.6
+* Fix serialization of nested functions with no parameters
+* Don���t use pytest plugins by default
+
+
Version 1.1.1
-------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/docs/contribute.rst new/tinycss2-1.2.1/docs/contribute.rst
--- old/tinycss2-1.1.1/docs/contribute.rst 2021-09-05 11:30:27.902646000 +0200
+++ new/tinycss2-1.2.1/docs/contribute.rst 2022-09-06 22:33:48.286416300 +0200
@@ -13,11 +13,9 @@
git clone https://github.com/Kozea/tinycss2.git
cd tinycss2
python -m venv venv
- venv/bin/pip install .[doc,test]
+ venv/bin/pip install -e .[doc,test]
-You can then let your terminal in the current directory and launch Python to
-test your changes. ``import tinycss2`` will then import the working directory
-code, so that you can modify it and test your changes.
+You can then launch Python to test your changes.
.. code-block:: shell
@@ -27,8 +25,8 @@
Code & Issues
-------------
-If you���ve found a bug in tinycss2, it���s time to report it, and to fix it if you
-can!
+If you���ve found a bug in tinycss2, it���s time to report it, and to fix it if
+you can!
You can report bugs and feature requests on GitHub_. If you want to add or
fix some code, please fork the repository and create a pull request, we���ll be
@@ -43,11 +41,19 @@
Tests are stored in the ``tests`` folder at the top of the repository. They use
the pytest_ library.
-You can launch tests (with code coverage and lint) using the following command::
+You can launch tests using the following command::
venv/bin/python -m pytest
+tinycss2 also uses isort_ to check imports and flake8_ to check the coding
+style::
+
+ venv/bin/python -m isort . --check --diff
+ venv/bin/python -m flake8 --exclude tests/css-parsing-tests
+
.. _pytest: https://docs.pytest.org/
+.. _isort: https://pycqa.github.io/isort/
+.. _flake8: https://flake8.pycqa.org/
Documentation
@@ -60,8 +66,7 @@
venv/bin/sphinx-build docs docs/_build
-The documentation home page can now be found in the
-``/path/to/tinycss2/docs/_build/index.html`` file. You can open this file in a
-browser to see the final rendering.
+The documentation home page can now be found in the ``docs/_build/index.html``
+file. You can open this file in a browser to see the final rendering.
.. _Sphinx: https://www.sphinx-doc.org/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/pyproject.toml new/tinycss2-1.2.1/pyproject.toml
--- old/tinycss2-1.1.1/pyproject.toml 2021-11-22 18:52:48.539322000 +0100
+++ new/tinycss2-1.2.1/pyproject.toml 2022-09-06 22:33:48.286416300 +0200
@@ -8,7 +8,7 @@
keywords = ['css', 'parser']
authors = [{name = 'Simon Sapin', email = 'simon.sapin(a)exyr.org'}]
maintainers = [{name = 'CourtBouillon', email = 'contact(a)courtbouillon.org'}]
-requires-python = '>=3.6'
+requires-python = '>=3.7'
readme = {file = 'README.rst', content-type = 'text/x-rst'}
license = {file = 'LICENSE'}
dependencies = ['webencodings >=0.4']
@@ -20,7 +20,6 @@
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3 :: Only',
- 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
@@ -41,13 +40,12 @@
[project.optional-dependencies]
doc = ['sphinx', 'sphinx_rtd_theme']
-test = ['pytest', 'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]']
+test = ['pytest', 'isort', 'flake8']
[tool.flit.sdist]
exclude = ['.*']
[tool.pytest.ini_options]
-addopts = '--isort --flake8 --cov --no-cov-on-fail'
norecursedirs = ['tests/css-parsing-tests']
[tool.coverage.run]
@@ -61,3 +59,4 @@
[tool.isort]
default_section = 'FIRSTPARTY'
multi_line_output = 4
+extend_skip = ['tests/css-parsing-tests']
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/tests/test_tinycss2.py new/tinycss2-1.2.1/tests/test_tinycss2.py
--- old/tinycss2-1.1.1/tests/test_tinycss2.py 2020-10-30 00:59:26.619073600 +0100
+++ new/tinycss2-1.2.1/tests/test_tinycss2.py 2022-10-17 21:08:32.237164700 +0200
@@ -217,6 +217,19 @@
assert serialize(rules) == source
+def test_serialize_rules_with_functions():
+ source = '''
+ foo#bar.baz {
+ background: url();
+ color: rgb(0, 0, 0);
+ width: calc(calc());
+ height: calc(calc(calc()));
+ }
+ '''
+ rules = parse_rule_list(source)
+ assert serialize(rules) == source
+
+
def test_backslash_delim():
source = '\\\nfoo'
tokens = parse_component_value_list(source)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/tinycss2/__init__.py new/tinycss2-1.2.1/tinycss2/__init__.py
--- old/tinycss2-1.1.1/tinycss2/__init__.py 2021-11-22 18:52:48.539322000 +0100
+++ new/tinycss2-1.2.1/tinycss2/__init__.py 2022-10-18 09:01:42.481755000 +0200
@@ -15,4 +15,4 @@
from .serializer import serialize, serialize_identifier # noqa
from .tokenizer import parse_component_value_list # noqa
-VERSION = __version__ = '1.1.1'
+VERSION = __version__ = '1.2.1'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tinycss2-1.1.1/tinycss2/ast.py new/tinycss2-1.2.1/tinycss2/ast.py
--- old/tinycss2-1.1.1/tinycss2/ast.py 2020-10-30 21:38:51.976693900 +0100
+++ new/tinycss2-1.2.1/tinycss2/ast.py 2022-10-17 21:08:32.237164700 +0200
@@ -54,12 +54,8 @@
self.source_line = source_line
self.source_column = source_column
- if str is bytes: # pragma: no cover
- def __repr__(self):
- return self.repr_format.format(self=self).encode('utf8')
- else: # pragma: no cover
- def __repr__(self):
- return self.repr_format.format(self=self)
+ def __repr__(self):
+ return self.repr_format.format(self=self)
def serialize(self):
"""Serialize this node to CSS syntax and return a Unicode string."""
@@ -698,15 +694,14 @@
write(serialize_identifier(self.name))
write('(')
_serialize_to(self.arguments, write)
- if self.arguments:
- function = self
- while isinstance(function, FunctionBlock):
- eof_in_string = (
- isinstance(function.arguments[-1], ParseError) and
- function.arguments[-1].kind == 'eof-in-string')
- if eof_in_string:
- return
- function = function.arguments[-1]
+ function = self
+ while isinstance(function, FunctionBlock) and function.arguments:
+ eof_in_string = (
+ isinstance(function.arguments[-1], ParseError) and
+ function.arguments[-1].kind == 'eof-in-string')
+ if eof_in_string:
+ return
+ function = function.arguments[-1]
write(')')
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ruamel.yaml.clib for openSUSE:Factory checked in at 2022-11-01 13:40:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml.clib (Old)
and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.clib.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml.clib"
Tue Nov 1 13:40:55 2022 rev:6 rq:1032434 version:0.2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ruamel.yaml.clib/python-ruamel.yaml.clib.changes 2021-07-29 21:31:27.036808997 +0200
+++ /work/SRC/openSUSE:Factory/.python-ruamel.yaml.clib.new.2275/python-ruamel.yaml.clib.changes 2022-11-01 13:41:03.139412223 +0100
@@ -1,0 +2,8 @@
+Sat Oct 29 00:41:38 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com>
+
+- Update to 0.2.7:
+ * Python 3.10 support
+ * Python 3.11 support
+ * regenerated with cython 0.29.32
+
+-------------------------------------------------------------------
Old:
----
ruamel.yaml.clib-0.2.6.tar.gz
New:
----
ruamel.yaml.clib-0.2.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ruamel.yaml.clib.spec ++++++
--- /var/tmp/diff_new_pack.oONwNG/_old 2022-11-01 13:41:04.231418033 +0100
+++ /var/tmp/diff_new_pack.oONwNG/_new 2022-11-01 13:41:04.235418053 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-ruamel.yaml.clib
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-ruamel.yaml.clib
-Version: 0.2.6
+Version: 0.2.7
Release: 0
Summary: Python YAML parser c-library
License: MIT
++++++ ruamel.yaml.clib-0.2.6.tar.gz -> ruamel.yaml.clib-0.2.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/LICENSE new/ruamel.yaml.clib-0.2.7/LICENSE
--- old/ruamel.yaml.clib-0.2.6/LICENSE 2021-07-04 15:29:15.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.7/LICENSE 2022-10-20 09:03:37.000000000 +0200
@@ -1,6 +1,6 @@
The MIT License (MIT)
- Copyright (c) 2019-2021 Anthon van der Neut, Ruamel bvba
+ Copyright (c) 2019-2022 Anthon van der Neut, Ruamel bvba
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/PKG-INFO new/ruamel.yaml.clib-0.2.7/PKG-INFO
--- old/ruamel.yaml.clib-0.2.6/PKG-INFO 2021-07-04 15:29:15.899298400 +0200
+++ new/ruamel.yaml.clib-0.2.7/PKG-INFO 2022-10-20 09:03:37.747841100 +0200
@@ -1,39 +1,12 @@
Metadata-Version: 2.1
Name: ruamel.yaml.clib
-Version: 0.2.6
+Version: 0.2.7
Summary: C version of reader, parser and emitter for ruamel.yaml derived from libyaml
Home-page: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree
Author: Anthon van der Neut
Author-email: a.van.der.neut(a)ruamel.eu
License: MIT
-Description:
- ruamel.yaml.clib
- ================
-
- ``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
-
- :version: 0.2.6
- :updated: 2021-07-04
- :documentation: http://yaml.readthedocs.io
- :repository: https://sourceforge.net/projects/ruamel-yaml-clib/
- :pypi: https://pypi.org/project/ruamel.yaml.clib/
-
- This package was split of from ruamel.yaml, so that ruamel.yaml can be build as
- a universal wheel. Apart from the C code seldom changing, and taking a long
- time to compile for all platforms, this allows installation of the .so
- on Linux systems under /usr/lib64/pythonX.Y (without a .pth file or a ruamel
- directory) and the Python code for ruamel.yaml under /usr/lib/pythonX.Y.
-
-
- .. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
- :target: https://bestpractices.coreinfrastructure.org/projects/1128
-
- .. image:: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_stati…
- :target: https://opensource.org/licenses/MIT
-
-
Keywords: yaml 1.2 parser c-library config
-Platform: UNKNOWN
Classifier: Development Status :: 4 - Beta
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
@@ -48,3 +21,30 @@
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Requires-Python: >=3.5
Description-Content-Type: text/x-rst
+License-File: LICENSE
+
+
+ruamel.yaml.clib
+================
+
+``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
+
+:version: 0.2.6
+:updated: 2021-07-04
+:documentation: http://yaml.readthedocs.io
+:repository: https://sourceforge.net/projects/ruamel-yaml-clib/
+:pypi: https://pypi.org/project/ruamel.yaml.clib/
+
+This package was split of from ruamel.yaml, so that ruamel.yaml can be build as
+a universal wheel. Apart from the C code seldom changing, and taking a long
+time to compile for all platforms, this allows installation of the .so
+on Linux systems under /usr/lib64/pythonX.Y (without a .pth file or a ruamel
+directory) and the Python code for ruamel.yaml under /usr/lib/pythonX.Y.
+
+
+.. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
+ :target: https://bestpractices.coreinfrastructure.org/projects/1128
+
+.. image:: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_stati…
+ :target: https://opensource.org/licenses/MIT
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/__init__.py new/ruamel.yaml.clib-0.2.7/__init__.py
--- old/ruamel.yaml.clib-0.2.6/__init__.py 2021-07-04 15:27:52.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.7/__init__.py 2022-10-20 09:03:08.000000000 +0200
@@ -7,8 +7,8 @@
_package_data = dict(
full_package_name='ruamel.yaml.clib',
- version_info=(0, 2, 6),
- __version__='0.2.6',
+ version_info=(0, 2, 7),
+ __version__='0.2.7',
author='Anthon van der Neut',
author_email='a.van.der.neut(a)ruamel.eu',
description='C version of reader, parser and emitter for ruamel.yaml derived from libyaml',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/_ruamel_yaml.c new/ruamel.yaml.clib-0.2.7/_ruamel_yaml.c
--- old/ruamel.yaml.clib-0.2.6/_ruamel_yaml.c 2021-06-24 21:56:36.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.7/_ruamel_yaml.c 2022-10-20 08:59:47.000000000 +0200
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.29.23 */
+/* Generated by Cython 0.29.32 */
#ifndef PY_SSIZE_T_CLEAN
#define PY_SSIZE_T_CLEAN
@@ -9,8 +9,8 @@
#elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000)
#error Cython requires Python 2.6+ or Python 3.3+.
#else
-#define CYTHON_ABI "0_29_23"
-#define CYTHON_HEX_VERSION 0x001D17F0
+#define CYTHON_ABI "0_29_32"
+#define CYTHON_HEX_VERSION 0x001D20F0
#define CYTHON_FUTURE_DIVISION 0
#include <stddef.h>
#ifndef offsetof
@@ -49,6 +49,7 @@
#define CYTHON_COMPILING_IN_PYPY 1
#define CYTHON_COMPILING_IN_PYSTON 0
#define CYTHON_COMPILING_IN_CPYTHON 0
+ #define CYTHON_COMPILING_IN_NOGIL 0
#undef CYTHON_USE_TYPE_SLOTS
#define CYTHON_USE_TYPE_SLOTS 0
#undef CYTHON_USE_PYTYPE_LOOKUP
@@ -85,10 +86,14 @@
#define CYTHON_USE_DICT_VERSIONS 0
#undef CYTHON_USE_EXC_INFO_STACK
#define CYTHON_USE_EXC_INFO_STACK 0
+ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
+ #define CYTHON_UPDATE_DESCRIPTOR_DOC (PYPY_VERSION_HEX >= 0x07030900)
+ #endif
#elif defined(PYSTON_VERSION)
#define CYTHON_COMPILING_IN_PYPY 0
#define CYTHON_COMPILING_IN_PYSTON 1
#define CYTHON_COMPILING_IN_CPYTHON 0
+ #define CYTHON_COMPILING_IN_NOGIL 0
#ifndef CYTHON_USE_TYPE_SLOTS
#define CYTHON_USE_TYPE_SLOTS 1
#endif
@@ -126,10 +131,59 @@
#define CYTHON_USE_DICT_VERSIONS 0
#undef CYTHON_USE_EXC_INFO_STACK
#define CYTHON_USE_EXC_INFO_STACK 0
+ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
+ #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
+ #endif
+#elif defined(PY_NOGIL)
+ #define CYTHON_COMPILING_IN_PYPY 0
+ #define CYTHON_COMPILING_IN_PYSTON 0
+ #define CYTHON_COMPILING_IN_CPYTHON 0
+ #define CYTHON_COMPILING_IN_NOGIL 1
+ #ifndef CYTHON_USE_TYPE_SLOTS
+ #define CYTHON_USE_TYPE_SLOTS 1
+ #endif
+ #undef CYTHON_USE_PYTYPE_LOOKUP
+ #define CYTHON_USE_PYTYPE_LOOKUP 0
+ #ifndef CYTHON_USE_ASYNC_SLOTS
+ #define CYTHON_USE_ASYNC_SLOTS 1
+ #endif
+ #undef CYTHON_USE_PYLIST_INTERNALS
+ #define CYTHON_USE_PYLIST_INTERNALS 0
+ #ifndef CYTHON_USE_UNICODE_INTERNALS
+ #define CYTHON_USE_UNICODE_INTERNALS 1
+ #endif
+ #undef CYTHON_USE_UNICODE_WRITER
+ #define CYTHON_USE_UNICODE_WRITER 0
+ #undef CYTHON_USE_PYLONG_INTERNALS
+ #define CYTHON_USE_PYLONG_INTERNALS 0
+ #ifndef CYTHON_AVOID_BORROWED_REFS
+ #define CYTHON_AVOID_BORROWED_REFS 0
+ #endif
+ #ifndef CYTHON_ASSUME_SAFE_MACROS
+ #define CYTHON_ASSUME_SAFE_MACROS 1
+ #endif
+ #ifndef CYTHON_UNPACK_METHODS
+ #define CYTHON_UNPACK_METHODS 1
+ #endif
+ #undef CYTHON_FAST_THREAD_STATE
+ #define CYTHON_FAST_THREAD_STATE 0
+ #undef CYTHON_FAST_PYCALL
+ #define CYTHON_FAST_PYCALL 0
+ #ifndef CYTHON_PEP489_MULTI_PHASE_INIT
+ #define CYTHON_PEP489_MULTI_PHASE_INIT 1
+ #endif
+ #ifndef CYTHON_USE_TP_FINALIZE
+ #define CYTHON_USE_TP_FINALIZE 1
+ #endif
+ #undef CYTHON_USE_DICT_VERSIONS
+ #define CYTHON_USE_DICT_VERSIONS 0
+ #undef CYTHON_USE_EXC_INFO_STACK
+ #define CYTHON_USE_EXC_INFO_STACK 0
#else
#define CYTHON_COMPILING_IN_PYPY 0
#define CYTHON_COMPILING_IN_PYSTON 0
#define CYTHON_COMPILING_IN_CPYTHON 1
+ #define CYTHON_COMPILING_IN_NOGIL 0
#ifndef CYTHON_USE_TYPE_SLOTS
#define CYTHON_USE_TYPE_SLOTS 1
#endif
@@ -157,7 +211,7 @@
#ifndef CYTHON_USE_UNICODE_INTERNALS
#define CYTHON_USE_UNICODE_INTERNALS 1
#endif
- #if PY_VERSION_HEX < 0x030300F0
+ #if PY_VERSION_HEX < 0x030300F0 || PY_VERSION_HEX >= 0x030B00A2
#undef CYTHON_USE_UNICODE_WRITER
#define CYTHON_USE_UNICODE_WRITER 0
#elif !defined(CYTHON_USE_UNICODE_WRITER)
@@ -172,11 +226,14 @@
#ifndef CYTHON_UNPACK_METHODS
#define CYTHON_UNPACK_METHODS 1
#endif
- #ifndef CYTHON_FAST_THREAD_STATE
+ #if PY_VERSION_HEX >= 0x030B00A4
+ #undef CYTHON_FAST_THREAD_STATE
+ #define CYTHON_FAST_THREAD_STATE 0
+ #elif !defined(CYTHON_FAST_THREAD_STATE)
#define CYTHON_FAST_THREAD_STATE 1
#endif
#ifndef CYTHON_FAST_PYCALL
- #define CYTHON_FAST_PYCALL 1
+ #define CYTHON_FAST_PYCALL (PY_VERSION_HEX < 0x030A0000)
#endif
#ifndef CYTHON_PEP489_MULTI_PHASE_INIT
#define CYTHON_PEP489_MULTI_PHASE_INIT (PY_VERSION_HEX >= 0x03050000)
@@ -187,15 +244,23 @@
#ifndef CYTHON_USE_DICT_VERSIONS
#define CYTHON_USE_DICT_VERSIONS (PY_VERSION_HEX >= 0x030600B1)
#endif
- #ifndef CYTHON_USE_EXC_INFO_STACK
+ #if PY_VERSION_HEX >= 0x030B00A4
+ #undef CYTHON_USE_EXC_INFO_STACK
+ #define CYTHON_USE_EXC_INFO_STACK 0
+ #elif !defined(CYTHON_USE_EXC_INFO_STACK)
#define CYTHON_USE_EXC_INFO_STACK (PY_VERSION_HEX >= 0x030700A3)
#endif
+ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
+ #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
+ #endif
#endif
#if !defined(CYTHON_FAST_PYCCALL)
#define CYTHON_FAST_PYCCALL (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1)
#endif
#if CYTHON_USE_PYLONG_INTERNALS
- #include "longintrepr.h"
+ #if PY_MAJOR_VERSION < 3
+ #include "longintrepr.h"
+ #endif
#undef SHIFT
#undef BASE
#undef MASK
@@ -312,9 +377,68 @@
#define __Pyx_DefaultClassType PyClass_Type
#else
#define __Pyx_BUILTIN_MODULE_NAME "builtins"
-#if PY_VERSION_HEX >= 0x030800A4 && PY_VERSION_HEX < 0x030800B2
- #define __Pyx_PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\
- PyCode_New(a, 0, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
+ #define __Pyx_DefaultClassType PyType_Type
+#if PY_VERSION_HEX >= 0x030B00A1
+ static CYTHON_INLINE PyCodeObject* __Pyx_PyCode_New(int a, int k, int l, int s, int f,
+ PyObject *code, PyObject *c, PyObject* n, PyObject *v,
+ PyObject *fv, PyObject *cell, PyObject* fn,
+ PyObject *name, int fline, PyObject *lnos) {
+ PyObject *kwds=NULL, *argcount=NULL, *posonlyargcount=NULL, *kwonlyargcount=NULL;
+ PyObject *nlocals=NULL, *stacksize=NULL, *flags=NULL, *replace=NULL, *call_result=NULL, *empty=NULL;
+ const char *fn_cstr=NULL;
+ const char *name_cstr=NULL;
+ PyCodeObject* co=NULL;
+ PyObject *type, *value, *traceback;
+ PyErr_Fetch(&type, &value, &traceback);
+ if (!(kwds=PyDict_New())) goto end;
+ if (!(argcount=PyLong_FromLong(a))) goto end;
+ if (PyDict_SetItemString(kwds, "co_argcount", argcount) != 0) goto end;
+ if (!(posonlyargcount=PyLong_FromLong(0))) goto end;
+ if (PyDict_SetItemString(kwds, "co_posonlyargcount", posonlyargcount) != 0) goto end;
+ if (!(kwonlyargcount=PyLong_FromLong(k))) goto end;
+ if (PyDict_SetItemString(kwds, "co_kwonlyargcount", kwonlyargcount) != 0) goto end;
+ if (!(nlocals=PyLong_FromLong(l))) goto end;
+ if (PyDict_SetItemString(kwds, "co_nlocals", nlocals) != 0) goto end;
+ if (!(stacksize=PyLong_FromLong(s))) goto end;
+ if (PyDict_SetItemString(kwds, "co_stacksize", stacksize) != 0) goto end;
+ if (!(flags=PyLong_FromLong(f))) goto end;
+ if (PyDict_SetItemString(kwds, "co_flags", flags) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_code", code) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_consts", c) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_names", n) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_varnames", v) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_freevars", fv) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_cellvars", cell) != 0) goto end;
+ if (PyDict_SetItemString(kwds, "co_linetable", lnos) != 0) goto end;
+ if (!(fn_cstr=PyUnicode_AsUTF8AndSize(fn, NULL))) goto end;
+ if (!(name_cstr=PyUnicode_AsUTF8AndSize(name, NULL))) goto end;
+ if (!(co = PyCode_NewEmpty(fn_cstr, name_cstr, fline))) goto end;
+ if (!(replace = PyObject_GetAttrString((PyObject*)co, "replace"))) goto cleanup_code_too;
+ if (!(empty = PyTuple_New(0))) goto cleanup_code_too; // unfortunately __pyx_empty_tuple isn't available here
+ if (!(call_result = PyObject_Call(replace, empty, kwds))) goto cleanup_code_too;
+ Py_XDECREF((PyObject*)co);
+ co = (PyCodeObject*)call_result;
+ call_result = NULL;
+ if (0) {
+ cleanup_code_too:
+ Py_XDECREF((PyObject*)co);
+ co = NULL;
+ }
+ end:
+ Py_XDECREF(kwds);
+ Py_XDECREF(argcount);
+ Py_XDECREF(posonlyargcount);
+ Py_XDECREF(kwonlyargcount);
+ Py_XDECREF(nlocals);
+ Py_XDECREF(stacksize);
+ Py_XDECREF(replace);
+ Py_XDECREF(call_result);
+ Py_XDECREF(empty);
+ if (type) {
+ PyErr_Restore(type, value, traceback);
+ }
+ return co;
+ }
#else
#define __Pyx_PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\
PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
@@ -428,8 +552,12 @@
#endif
#if PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND)
#define CYTHON_PEP393_ENABLED 1
+ #if defined(PyUnicode_IS_READY)
#define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\
0 : _PyUnicode_Ready((PyObject *)(op)))
+ #else
+ #define __Pyx_PyUnicode_READY(op) (0)
+ #endif
#define __Pyx_PyUnicode_GET_LENGTH(u) PyUnicode_GET_LENGTH(u)
#define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i)
#define __Pyx_PyUnicode_MAX_CHAR_VALUE(u) PyUnicode_MAX_CHAR_VALUE(u)
@@ -438,7 +566,11 @@
#define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i)
#define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch)
#if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE)
+ #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000
+ #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length))
+ #else
#define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u)))
+ #endif
#else
#define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u))
#endif
@@ -544,10 +676,10 @@
#if PY_VERSION_HEX < 0x030200A4
typedef long Py_hash_t;
#define __Pyx_PyInt_FromHash_t PyInt_FromLong
- #define __Pyx_PyInt_AsHash_t PyInt_AsLong
+ #define __Pyx_PyInt_AsHash_t __Pyx_PyIndex_AsHash_t
#else
#define __Pyx_PyInt_FromHash_t PyInt_FromSsize_t
- #define __Pyx_PyInt_AsHash_t PyInt_AsSsize_t
+ #define __Pyx_PyInt_AsHash_t __Pyx_PyIndex_AsSsize_t
#endif
#if PY_MAJOR_VERSION >= 3
#define __Pyx_PyMethod_New(func, self, klass) ((self) ? ((void)(klass), PyMethod_New(func, self)) : __Pyx_NewRef(func))
@@ -572,8 +704,10 @@
} __Pyx_PyAsyncMethodsStruct;
#endif
-#if defined(WIN32) || defined(MS_WINDOWS)
- #define _USE_MATH_DEFINES
+#if defined(_WIN32) || defined(WIN32) || defined(MS_WINDOWS)
+ #if !defined(_USE_MATH_DEFINES)
+ #define _USE_MATH_DEFINES
+ #endif
#endif
#include <math.h>
#ifdef NAN
@@ -704,6 +838,7 @@
(likely(PyTuple_CheckExact(obj)) ? __Pyx_NewRef(obj) : PySequence_Tuple(obj))
static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
+static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
#if CYTHON_ASSUME_SAFE_MACROS
#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
#else
@@ -1164,13 +1299,21 @@
#ifndef Py_MEMBER_SIZE
#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
#endif
+#if CYTHON_FAST_PYCALL
static size_t __pyx_pyframe_localsplus_offset = 0;
#include "frameobject.h"
+#if PY_VERSION_HEX >= 0x030b00a6
+ #ifndef Py_BUILD_CORE
+ #define Py_BUILD_CORE 1
+ #endif
+ #include "internal/pycore_frame.h"
+#endif
#define __Pxy_PyFrame_Initialize_Offsets()\
((void)__Pyx_BUILD_ASSERT_EXPR(sizeof(PyFrameObject) == offsetof(PyFrameObject, f_localsplus) + Py_MEMBER_SIZE(PyFrameObject, f_localsplus)),\
(void)(__pyx_pyframe_localsplus_offset = ((size_t)PyFrame_Type.tp_basicsize) - Py_MEMBER_SIZE(PyFrameObject, f_localsplus)))
#define __Pyx_PyFrame_GetLocalsplus(frame)\
(assert(__pyx_pyframe_localsplus_offset), (PyObject **)(((char *)(frame)) + __pyx_pyframe_localsplus_offset))
+#endif // CYTHON_FAST_PYCALL
#endif
/* PyCFunctionFastCall.proto */
@@ -1584,7 +1727,7 @@
static const char __pyx_k_tag_prefix_must_be_a_string[] = "tag prefix must be a string";
static const char __pyx_k_serializer_is_already_opened[] = "serializer is already opened";
static const char __pyx_k_Pickling_of_struct_members_such[] = "Pickling of struct members such as self.emitter must be explicitly requested with @auto_pickle(True)";
-static const char __pyx_k_Incompatible_checksums_s_vs_0x3f[] = "Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))";
+static const char __pyx_k_Incompatible_checksums_0x_x_vs_0[] = "Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))";
static const char __pyx_k_a_string_or_stream_input_is_requ[] = "a string or stream input is required";
static const char __pyx_k_expected_a_single_document_in_th[] = "expected a single document in the stream";
static const char __pyx_k_found_duplicate_anchor_first_occ[] = "found duplicate anchor; first occurrence";
@@ -1612,7 +1755,7 @@
static PyObject *__pyx_n_s_FlowMappingStartToken;
static PyObject *__pyx_n_s_FlowSequenceEndToken;
static PyObject *__pyx_n_s_FlowSequenceStartToken;
-static PyObject *__pyx_kp_s_Incompatible_checksums_s_vs_0x3f;
+static PyObject *__pyx_kp_s_Incompatible_checksums_0x_x_vs_0;
static PyObject *__pyx_n_s_KeyToken;
static PyObject *__pyx_n_s_MappingEndEvent;
static PyObject *__pyx_n_s_MappingNode;
@@ -1832,7 +1975,9 @@
static PyObject *__pyx_tp_new_12_ruamel_yaml_CEmitter(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
static PyObject *__pyx_int_0;
static PyObject *__pyx_int_1;
+static PyObject *__pyx_int_41581148;
static PyObject *__pyx_int_66733494;
+static PyObject *__pyx_int_96533895;
static PyObject *__pyx_tuple_;
static PyObject *__pyx_tuple__2;
static PyObject *__pyx_tuple__4;
@@ -1864,11 +2009,12 @@
static PyObject *__pyx_tuple__38;
static PyObject *__pyx_tuple__39;
static PyObject *__pyx_tuple__40;
-static PyObject *__pyx_tuple__42;
-static PyObject *__pyx_tuple__44;
-static PyObject *__pyx_codeobj__41;
-static PyObject *__pyx_codeobj__43;
-static PyObject *__pyx_codeobj__45;
+static PyObject *__pyx_tuple__41;
+static PyObject *__pyx_tuple__43;
+static PyObject *__pyx_tuple__45;
+static PyObject *__pyx_codeobj__42;
+static PyObject *__pyx_codeobj__44;
+static PyObject *__pyx_codeobj__46;
/* Late includes */
/* "_ruamel_yaml.pyx":3
@@ -23501,12 +23647,12 @@
PyObject *__pyx_v___pyx_result = 0;
PyObject *__pyx_r = NULL;
__Pyx_RefNannyDeclarations
- int __pyx_t_1;
- PyObject *__pyx_t_2 = NULL;
- PyObject *__pyx_t_3 = NULL;
+ PyObject *__pyx_t_1 = NULL;
+ int __pyx_t_2;
+ int __pyx_t_3;
PyObject *__pyx_t_4 = NULL;
PyObject *__pyx_t_5 = NULL;
- int __pyx_t_6;
+ PyObject *__pyx_t_6 = NULL;
int __pyx_lineno = 0;
const char *__pyx_filename = NULL;
int __pyx_clineno = 0;
@@ -23515,114 +23661,118 @@
/* "(tree fragment)":4
* cdef object __pyx_PickleError
* cdef object __pyx_result
- * if __pyx_checksum != 0x3fa45b6: # <<<<<<<<<<<<<<
+ * if __pyx_checksum not in (0x3fa45b6, 0x27a7a5c, 0x5c0fd87): # <<<<<<<<<<<<<<
* from pickle import PickleError as __pyx_PickleError
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
*/
- __pyx_t_1 = ((__pyx_v___pyx_checksum != 0x3fa45b6) != 0);
- if (__pyx_t_1) {
+ __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_t_1, __pyx_tuple__40, Py_NE)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(1, 4, __pyx_L1_error)
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ __pyx_t_3 = (__pyx_t_2 != 0);
+ if (__pyx_t_3) {
/* "(tree fragment)":5
* cdef object __pyx_result
- * if __pyx_checksum != 0x3fa45b6:
+ * if __pyx_checksum not in (0x3fa45b6, 0x27a7a5c, 0x5c0fd87):
* from pickle import PickleError as __pyx_PickleError # <<<<<<<<<<<<<<
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
* __pyx_result = Mark.__new__(__pyx_type)
*/
- __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_2);
+ __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_1);
__Pyx_INCREF(__pyx_n_s_PickleError);
__Pyx_GIVEREF(__pyx_n_s_PickleError);
- PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_PickleError);
- __pyx_t_3 = __Pyx_Import(__pyx_n_s_pickle, __pyx_t_2, -1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_3);
- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_2);
- __Pyx_INCREF(__pyx_t_2);
- __pyx_v___pyx_PickleError = __pyx_t_2;
- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_PickleError);
+ __pyx_t_4 = __Pyx_Import(__pyx_n_s_pickle, __pyx_t_1, -1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_4, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_1);
+ __Pyx_INCREF(__pyx_t_1);
+ __pyx_v___pyx_PickleError = __pyx_t_1;
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
/* "(tree fragment)":6
- * if __pyx_checksum != 0x3fa45b6:
+ * if __pyx_checksum not in (0x3fa45b6, 0x27a7a5c, 0x5c0fd87):
* from pickle import PickleError as __pyx_PickleError
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum) # <<<<<<<<<<<<<<
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum) # <<<<<<<<<<<<<<
* __pyx_result = Mark.__new__(__pyx_type)
* if __pyx_state is not None:
*/
- __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 6, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyString_Format(__pyx_kp_s_Incompatible_checksums_s_vs_0x3f, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 6, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_4);
- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 6, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_5 = __Pyx_PyString_Format(__pyx_kp_s_Incompatible_checksums_0x_x_vs_0, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 6, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_INCREF(__pyx_v___pyx_PickleError);
- __pyx_t_2 = __pyx_v___pyx_PickleError; __pyx_t_5 = NULL;
- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) {
- __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_2);
- if (likely(__pyx_t_5)) {
- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);
- __Pyx_INCREF(__pyx_t_5);
+ __pyx_t_1 = __pyx_v___pyx_PickleError; __pyx_t_6 = NULL;
+ if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) {
+ __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1);
+ if (likely(__pyx_t_6)) {
+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1);
+ __Pyx_INCREF(__pyx_t_6);
__Pyx_INCREF(function);
- __Pyx_DECREF_SET(__pyx_t_2, function);
+ __Pyx_DECREF_SET(__pyx_t_1, function);
}
}
- __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_5, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_4);
- __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_4 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5);
+ __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 6, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ __Pyx_Raise(__pyx_t_4, 0, 0, 0);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 6, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_3);
- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __Pyx_Raise(__pyx_t_3, 0, 0, 0);
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__PYX_ERR(1, 6, __pyx_L1_error)
/* "(tree fragment)":4
* cdef object __pyx_PickleError
* cdef object __pyx_result
- * if __pyx_checksum != 0x3fa45b6: # <<<<<<<<<<<<<<
+ * if __pyx_checksum not in (0x3fa45b6, 0x27a7a5c, 0x5c0fd87): # <<<<<<<<<<<<<<
* from pickle import PickleError as __pyx_PickleError
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
*/
}
/* "(tree fragment)":7
* from pickle import PickleError as __pyx_PickleError
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
* __pyx_result = Mark.__new__(__pyx_type) # <<<<<<<<<<<<<<
* if __pyx_state is not None:
* __pyx_unpickle_Mark__set_state(<Mark> __pyx_result, __pyx_state)
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_12_ruamel_yaml_Mark), __pyx_n_s_new); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 7, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = NULL;
- if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) {
- __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_2);
- if (likely(__pyx_t_4)) {
- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);
- __Pyx_INCREF(__pyx_t_4);
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_12_ruamel_yaml_Mark), __pyx_n_s_new); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 7, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_5 = NULL;
+ if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) {
+ __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1);
+ if (likely(__pyx_t_5)) {
+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1);
+ __Pyx_INCREF(__pyx_t_5);
__Pyx_INCREF(function);
- __Pyx_DECREF_SET(__pyx_t_2, function);
+ __Pyx_DECREF_SET(__pyx_t_1, function);
}
}
- __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_4, __pyx_v___pyx_type) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v___pyx_type);
- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
- if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 7, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_3);
- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_v___pyx_result = __pyx_t_3;
- __pyx_t_3 = 0;
+ __pyx_t_4 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_v___pyx_type) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v___pyx_type);
+ __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 7, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ __pyx_v___pyx_result = __pyx_t_4;
+ __pyx_t_4 = 0;
/* "(tree fragment)":8
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
* __pyx_result = Mark.__new__(__pyx_type)
* if __pyx_state is not None: # <<<<<<<<<<<<<<
* __pyx_unpickle_Mark__set_state(<Mark> __pyx_result, __pyx_state)
* return __pyx_result
*/
- __pyx_t_1 = (__pyx_v___pyx_state != Py_None);
- __pyx_t_6 = (__pyx_t_1 != 0);
- if (__pyx_t_6) {
+ __pyx_t_3 = (__pyx_v___pyx_state != Py_None);
+ __pyx_t_2 = (__pyx_t_3 != 0);
+ if (__pyx_t_2) {
/* "(tree fragment)":9
* __pyx_result = Mark.__new__(__pyx_type)
@@ -23632,12 +23782,12 @@
* cdef __pyx_unpickle_Mark__set_state(Mark __pyx_result, tuple __pyx_state):
*/
if (!(likely(PyTuple_CheckExact(__pyx_v___pyx_state))||((__pyx_v___pyx_state) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_v___pyx_state)->tp_name), 0))) __PYX_ERR(1, 9, __pyx_L1_error)
- __pyx_t_3 = __pyx_f_12_ruamel_yaml___pyx_unpickle_Mark__set_state(((struct __pyx_obj_12_ruamel_yaml_Mark *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 9, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_t_3);
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ __pyx_t_4 = __pyx_f_12_ruamel_yaml___pyx_unpickle_Mark__set_state(((struct __pyx_obj_12_ruamel_yaml_Mark *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 9, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
/* "(tree fragment)":8
- * raise __pyx_PickleError("Incompatible checksums (%s vs 0x3fa45b6 = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
+ * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x3fa45b6, 0x27a7a5c, 0x5c0fd87) = (buffer, column, index, line, name, pointer))" % __pyx_checksum)
* __pyx_result = Mark.__new__(__pyx_type)
* if __pyx_state is not None: # <<<<<<<<<<<<<<
* __pyx_unpickle_Mark__set_state(<Mark> __pyx_result, __pyx_state)
@@ -23665,10 +23815,10 @@
/* function exit code */
__pyx_L1_error:;
- __Pyx_XDECREF(__pyx_t_2);
- __Pyx_XDECREF(__pyx_t_3);
+ __Pyx_XDECREF(__pyx_t_1);
__Pyx_XDECREF(__pyx_t_4);
__Pyx_XDECREF(__pyx_t_5);
+ __Pyx_XDECREF(__pyx_t_6);
__Pyx_AddTraceback("_ruamel_yaml.__pyx_unpickle_Mark", __pyx_clineno, __pyx_lineno, __pyx_filename);
__pyx_r = NULL;
__pyx_L0:;
@@ -24023,12 +24173,15 @@
#if PY_VERSION_HEX >= 0x030400a1
0, /*tp_finalize*/
#endif
- #if PY_VERSION_HEX >= 0x030800b1
+ #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800)
0, /*tp_vectorcall*/
#endif
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/
#endif
+ #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000
+ 0, /*tp_pypy_flags*/
+ #endif
};
static struct __pyx_vtabstruct_12_ruamel_yaml_CParser __pyx_vtable_12_ruamel_yaml_CParser;
@@ -24204,12 +24357,15 @@
#if PY_VERSION_HEX >= 0x030400a1
0, /*tp_finalize*/
#endif
- #if PY_VERSION_HEX >= 0x030800b1
+ #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800)
0, /*tp_vectorcall*/
#endif
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/
#endif
+ #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000
+ 0, /*tp_pypy_flags*/
+ #endif
};
static struct __pyx_vtabstruct_12_ruamel_yaml_CEmitter __pyx_vtable_12_ruamel_yaml_CEmitter;
@@ -24378,12 +24534,15 @@
#if PY_VERSION_HEX >= 0x030400a1
0, /*tp_finalize*/
#endif
- #if PY_VERSION_HEX >= 0x030800b1
+ #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800)
0, /*tp_vectorcall*/
#endif
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/
#endif
+ #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000
+ 0, /*tp_pypy_flags*/
+ #endif
};
static PyMethodDef __pyx_methods[] = {
@@ -24455,7 +24614,7 @@
{&__pyx_n_s_FlowMappingStartToken, __pyx_k_FlowMappingStartToken, sizeof(__pyx_k_FlowMappingStartToken), 0, 0, 1, 1},
{&__pyx_n_s_FlowSequenceEndToken, __pyx_k_FlowSequenceEndToken, sizeof(__pyx_k_FlowSequenceEndToken), 0, 0, 1, 1},
{&__pyx_n_s_FlowSequenceStartToken, __pyx_k_FlowSequenceStartToken, sizeof(__pyx_k_FlowSequenceStartToken), 0, 0, 1, 1},
- {&__pyx_kp_s_Incompatible_checksums_s_vs_0x3f, __pyx_k_Incompatible_checksums_s_vs_0x3f, sizeof(__pyx_k_Incompatible_checksums_s_vs_0x3f), 0, 0, 1, 0},
+ {&__pyx_kp_s_Incompatible_checksums_0x_x_vs_0, __pyx_k_Incompatible_checksums_0x_x_vs_0, sizeof(__pyx_k_Incompatible_checksums_0x_x_vs_0), 0, 0, 1, 0},
{&__pyx_n_s_KeyToken, __pyx_k_KeyToken, sizeof(__pyx_k_KeyToken), 0, 0, 1, 1},
{&__pyx_n_s_MappingEndEvent, __pyx_k_MappingEndEvent, sizeof(__pyx_k_MappingEndEvent), 0, 0, 1, 1},
{&__pyx_n_s_MappingNode, __pyx_k_MappingNode, sizeof(__pyx_k_MappingNode), 0, 0, 1, 1},
@@ -24970,6 +25129,9 @@
__pyx_tuple__39 = PyTuple_Pack(1, __pyx_kp_s_Pickling_of_struct_members_such); if (unlikely(!__pyx_tuple__39)) __PYX_ERR(1, 4, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__39);
__Pyx_GIVEREF(__pyx_tuple__39);
+ __pyx_tuple__40 = PyTuple_Pack(3, __pyx_int_66733494, __pyx_int_41581148, __pyx_int_96533895); if (unlikely(!__pyx_tuple__40)) __PYX_ERR(1, 4, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_tuple__40);
+ __Pyx_GIVEREF(__pyx_tuple__40);
/* "_ruamel_yaml.pyx":3
*
@@ -24978,10 +25140,10 @@
* cdef char *value
* value = yaml_get_version_string()
*/
- __pyx_tuple__40 = PyTuple_Pack(1, __pyx_n_s_value); if (unlikely(!__pyx_tuple__40)) __PYX_ERR(0, 3, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_tuple__40);
- __Pyx_GIVEREF(__pyx_tuple__40);
- __pyx_codeobj__41 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_ruamel_yaml_pyx, __pyx_n_s_get_version_string, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__41)) __PYX_ERR(0, 3, __pyx_L1_error)
+ __pyx_tuple__41 = PyTuple_Pack(1, __pyx_n_s_value); if (unlikely(!__pyx_tuple__41)) __PYX_ERR(0, 3, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_tuple__41);
+ __Pyx_GIVEREF(__pyx_tuple__41);
+ __pyx_codeobj__42 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__41, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_ruamel_yaml_pyx, __pyx_n_s_get_version_string, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__42)) __PYX_ERR(0, 3, __pyx_L1_error)
/* "_ruamel_yaml.pyx":11
* return PyUnicode_FromString(value)
@@ -24990,20 +25152,20 @@
* cdef int major, minor, patch
* yaml_get_version(&major, &minor, &patch)
*/
- __pyx_tuple__42 = PyTuple_Pack(3, __pyx_n_s_major, __pyx_n_s_minor, __pyx_n_s_patch); if (unlikely(!__pyx_tuple__42)) __PYX_ERR(0, 11, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_tuple__42);
- __Pyx_GIVEREF(__pyx_tuple__42);
- __pyx_codeobj__43 = (PyObject*)__Pyx_PyCode_New(0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__42, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_ruamel_yaml_pyx, __pyx_n_s_get_version, 11, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__43)) __PYX_ERR(0, 11, __pyx_L1_error)
+ __pyx_tuple__43 = PyTuple_Pack(3, __pyx_n_s_major, __pyx_n_s_minor, __pyx_n_s_patch); if (unlikely(!__pyx_tuple__43)) __PYX_ERR(0, 11, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_tuple__43);
+ __Pyx_GIVEREF(__pyx_tuple__43);
+ __pyx_codeobj__44 = (PyObject*)__Pyx_PyCode_New(0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__43, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_ruamel_yaml_pyx, __pyx_n_s_get_version, 11, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__44)) __PYX_ERR(0, 11, __pyx_L1_error)
/* "(tree fragment)":1
* def __pyx_unpickle_Mark(__pyx_type, long __pyx_checksum, __pyx_state): # <<<<<<<<<<<<<<
* cdef object __pyx_PickleError
* cdef object __pyx_result
*/
- __pyx_tuple__44 = PyTuple_Pack(5, __pyx_n_s_pyx_type, __pyx_n_s_pyx_checksum, __pyx_n_s_pyx_state, __pyx_n_s_pyx_PickleError, __pyx_n_s_pyx_result); if (unlikely(!__pyx_tuple__44)) __PYX_ERR(1, 1, __pyx_L1_error)
- __Pyx_GOTREF(__pyx_tuple__44);
- __Pyx_GIVEREF(__pyx_tuple__44);
- __pyx_codeobj__45 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__44, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_Mark, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__45)) __PYX_ERR(1, 1, __pyx_L1_error)
+ __pyx_tuple__45 = PyTuple_Pack(5, __pyx_n_s_pyx_type, __pyx_n_s_pyx_checksum, __pyx_n_s_pyx_state, __pyx_n_s_pyx_PickleError, __pyx_n_s_pyx_result); if (unlikely(!__pyx_tuple__45)) __PYX_ERR(1, 1, __pyx_L1_error)
+ __Pyx_GOTREF(__pyx_tuple__45);
+ __Pyx_GIVEREF(__pyx_tuple__45);
+ __pyx_codeobj__46 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__45, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_Mark, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__46)) __PYX_ERR(1, 1, __pyx_L1_error)
__Pyx_RefNannyFinishContext();
return 0;
__pyx_L1_error:;
@@ -25015,7 +25177,9 @@
if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 3, __pyx_L1_error);
__pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(0, 3, __pyx_L1_error)
__pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(0, 3, __pyx_L1_error)
+ __pyx_int_41581148 = PyInt_FromLong(41581148L); if (unlikely(!__pyx_int_41581148)) __PYX_ERR(0, 3, __pyx_L1_error)
__pyx_int_66733494 = PyInt_FromLong(66733494L); if (unlikely(!__pyx_int_66733494)) __PYX_ERR(0, 3, __pyx_L1_error)
+ __pyx_int_96533895 = PyInt_FromLong(96533895L); if (unlikely(!__pyx_int_96533895)) __PYX_ERR(0, 3, __pyx_L1_error)
return 0;
__pyx_L1_error:;
return -1;
@@ -25286,11 +25450,9 @@
#endif
/*--- Library function declarations ---*/
/*--- Threads initialization code ---*/
- #if defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
- #ifdef WITH_THREAD /* Python build with threading support? */
+ #if defined(WITH_THREAD) && PY_VERSION_HEX < 0x030700F0 && defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
PyEval_InitThreads();
#endif
- #endif
/*--- Module creation code ---*/
#if CYTHON_PEP489_MULTI_PHASE_INIT
__pyx_m = __pyx_pyinit_module;
@@ -26756,7 +26918,7 @@
#if CYTHON_COMPILING_IN_CPYTHON
static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) {
PyObject *result;
- ternaryfunc call = func->ob_type->tp_call;
+ ternaryfunc call = Py_TYPE(func)->tp_call;
if (unlikely(!call))
return PyObject_Call(func, arg, kw);
if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
@@ -27397,7 +27559,7 @@
return (equals == Py_EQ);
} else {
int result;
-#if CYTHON_USE_UNICODE_INTERNALS
+#if CYTHON_USE_UNICODE_INTERNALS && (PY_VERSION_HEX < 0x030B0000)
Py_hash_t hash1, hash2;
hash1 = ((PyBytesObject*)s1)->ob_shash;
hash2 = ((PyBytesObject*)s2)->ob_shash;
@@ -27757,17 +27919,35 @@
static int __Pyx_setup_reduce(PyObject* type_obj) {
int ret = 0;
PyObject *object_reduce = NULL;
+ PyObject *object_getstate = NULL;
PyObject *object_reduce_ex = NULL;
PyObject *reduce = NULL;
PyObject *reduce_ex = NULL;
PyObject *reduce_cython = NULL;
PyObject *setstate = NULL;
PyObject *setstate_cython = NULL;
+ PyObject *getstate = NULL;
+#if CYTHON_USE_PYTYPE_LOOKUP
+ getstate = _PyType_Lookup((PyTypeObject*)type_obj, __pyx_n_s_getstate);
+#else
+ getstate = __Pyx_PyObject_GetAttrStrNoError(type_obj, __pyx_n_s_getstate);
+ if (!getstate && PyErr_Occurred()) {
+ goto __PYX_BAD;
+ }
+#endif
+ if (getstate) {
#if CYTHON_USE_PYTYPE_LOOKUP
- if (_PyType_Lookup((PyTypeObject*)type_obj, __pyx_n_s_getstate)) goto __PYX_GOOD;
+ object_getstate = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_getstate);
#else
- if (PyObject_HasAttr(type_obj, __pyx_n_s_getstate)) goto __PYX_GOOD;
+ object_getstate = __Pyx_PyObject_GetAttrStrNoError((PyObject*)&PyBaseObject_Type, __pyx_n_s_getstate);
+ if (!object_getstate && PyErr_Occurred()) {
+ goto __PYX_BAD;
+ }
#endif
+ if (object_getstate != getstate) {
+ goto __PYX_GOOD;
+ }
+ }
#if CYTHON_USE_PYTYPE_LOOKUP
object_reduce_ex = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_reduce_ex); if (!object_reduce_ex) goto __PYX_BAD;
#else
@@ -27812,6 +27992,8 @@
#if !CYTHON_USE_PYTYPE_LOOKUP
Py_XDECREF(object_reduce);
Py_XDECREF(object_reduce_ex);
+ Py_XDECREF(object_getstate);
+ Py_XDECREF(getstate);
#endif
Py_XDECREF(reduce);
Py_XDECREF(reduce_ex);
@@ -27871,7 +28053,7 @@
}
if (!use_cline) {
c_line = 0;
- PyObject_SetAttr(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback, Py_False);
+ (void) PyObject_SetAttr(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback, Py_False);
}
else if (use_cline == Py_False || (use_cline != Py_True && PyObject_Not(use_cline) != 0)) {
c_line = 0;
@@ -27965,33 +28147,40 @@
#include "compile.h"
#include "frameobject.h"
#include "traceback.h"
+#if PY_VERSION_HEX >= 0x030b00a6
+ #ifndef Py_BUILD_CORE
+ #define Py_BUILD_CORE 1
+ #endif
+ #include "internal/pycore_frame.h"
+#endif
static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
const char *funcname, int c_line,
int py_line, const char *filename) {
- PyCodeObject *py_code = 0;
- PyObject *py_srcfile = 0;
- PyObject *py_funcname = 0;
+ PyCodeObject *py_code = NULL;
+ PyObject *py_funcname = NULL;
#if PY_MAJOR_VERSION < 3
+ PyObject *py_srcfile = NULL;
py_srcfile = PyString_FromString(filename);
- #else
- py_srcfile = PyUnicode_FromString(filename);
- #endif
if (!py_srcfile) goto bad;
+ #endif
if (c_line) {
#if PY_MAJOR_VERSION < 3
py_funcname = PyString_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, c_line);
+ if (!py_funcname) goto bad;
#else
py_funcname = PyUnicode_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, c_line);
+ if (!py_funcname) goto bad;
+ funcname = PyUnicode_AsUTF8(py_funcname);
+ if (!funcname) goto bad;
#endif
}
else {
#if PY_MAJOR_VERSION < 3
py_funcname = PyString_FromString(funcname);
- #else
- py_funcname = PyUnicode_FromString(funcname);
+ if (!py_funcname) goto bad;
#endif
}
- if (!py_funcname) goto bad;
+ #if PY_MAJOR_VERSION < 3
py_code = __Pyx_PyCode_New(
0,
0,
@@ -28010,11 +28199,16 @@
__pyx_empty_bytes /*PyObject *lnotab*/
);
Py_DECREF(py_srcfile);
- Py_DECREF(py_funcname);
+ #else
+ py_code = PyCode_NewEmpty(filename, funcname, py_line);
+ #endif
+ Py_XDECREF(py_funcname); // XDECREF since it's only set on Py3 if cline
return py_code;
bad:
- Py_XDECREF(py_srcfile);
Py_XDECREF(py_funcname);
+ #if PY_MAJOR_VERSION < 3
+ Py_XDECREF(py_srcfile);
+ #endif
return NULL;
}
static void __Pyx_AddTraceback(const char *funcname, int c_line,
@@ -28022,14 +28216,24 @@
PyCodeObject *py_code = 0;
PyFrameObject *py_frame = 0;
PyThreadState *tstate = __Pyx_PyThreadState_Current;
+ PyObject *ptype, *pvalue, *ptraceback;
if (c_line) {
c_line = __Pyx_CLineForTraceback(tstate, c_line);
}
py_code = __pyx_find_code_object(c_line ? -c_line : py_line);
if (!py_code) {
+ __Pyx_ErrFetchInState(tstate, &ptype, &pvalue, &ptraceback);
py_code = __Pyx_CreateCodeObjectForTraceback(
funcname, c_line, py_line, filename);
- if (!py_code) goto bad;
+ if (!py_code) {
+ /* If the code object creation fails, then we should clear the
+ fetched exception references and propagate the new exception */
+ Py_XDECREF(ptype);
+ Py_XDECREF(pvalue);
+ Py_XDECREF(ptraceback);
+ goto bad;
+ }
+ __Pyx_ErrRestoreInState(tstate, ptype, pvalue, ptraceback);
__pyx_insert_code_object(c_line ? -c_line : py_line, py_code);
}
py_frame = PyFrame_New(
@@ -28834,11 +29038,33 @@
/* CheckBinaryVersion */
static int __Pyx_check_binary_version(void) {
- char ctversion[4], rtversion[4];
- PyOS_snprintf(ctversion, 4, "%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION);
- PyOS_snprintf(rtversion, 4, "%s", Py_GetVersion());
- if (ctversion[0] != rtversion[0] || ctversion[2] != rtversion[2]) {
+ char ctversion[5];
+ int same=1, i, found_dot;
+ const char* rt_from_call = Py_GetVersion();
+ PyOS_snprintf(ctversion, 5, "%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION);
+ found_dot = 0;
+ for (i = 0; i < 4; i++) {
+ if (!ctversion[i]) {
+ same = (rt_from_call[i] < '0' || rt_from_call[i] > '9');
+ break;
+ }
+ if (rt_from_call[i] != ctversion[i]) {
+ same = 0;
+ break;
+ }
+ }
+ if (!same) {
+ char rtversion[5] = {'\0'};
char message[200];
+ for (i=0; i<4; ++i) {
+ if (rt_from_call[i] == '.') {
+ if (found_dot) break;
+ found_dot = 1;
+ } else if (rt_from_call[i] < '0' || rt_from_call[i] > '9') {
+ break;
+ }
+ rtversion[i] = rt_from_call[i];
+ }
PyOS_snprintf(message, sizeof(message),
"compiletime version %s of module '%.100s' "
"does not match runtime version %s",
@@ -29096,6 +29322,23 @@
Py_DECREF(x);
return ival;
}
+static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject* o) {
+ if (sizeof(Py_hash_t) == sizeof(Py_ssize_t)) {
+ return (Py_hash_t) __Pyx_PyIndex_AsSsize_t(o);
+#if PY_MAJOR_VERSION < 3
+ } else if (likely(PyInt_CheckExact(o))) {
+ return PyInt_AS_LONG(o);
+#endif
+ } else {
+ Py_ssize_t ival;
+ PyObject *x;
+ x = PyNumber_Index(o);
+ if (!x) return -1;
+ ival = PyInt_AsLong(x);
+ Py_DECREF(x);
+ return ival;
+ }
+}
static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b) {
return b ? __Pyx_NewRef(Py_True) : __Pyx_NewRef(Py_False);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/ruamel.yaml.clib.egg-info/PKG-INFO new/ruamel.yaml.clib-0.2.7/ruamel.yaml.clib.egg-info/PKG-INFO
--- old/ruamel.yaml.clib-0.2.6/ruamel.yaml.clib.egg-info/PKG-INFO 2021-07-04 15:29:15.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.7/ruamel.yaml.clib.egg-info/PKG-INFO 2022-10-20 09:03:37.000000000 +0200
@@ -1,39 +1,12 @@
Metadata-Version: 2.1
Name: ruamel.yaml.clib
-Version: 0.2.6
+Version: 0.2.7
Summary: C version of reader, parser and emitter for ruamel.yaml derived from libyaml
Home-page: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree
Author: Anthon van der Neut
Author-email: a.van.der.neut(a)ruamel.eu
License: MIT
-Description:
- ruamel.yaml.clib
- ================
-
- ``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
-
- :version: 0.2.6
- :updated: 2021-07-04
- :documentation: http://yaml.readthedocs.io
- :repository: https://sourceforge.net/projects/ruamel-yaml-clib/
- :pypi: https://pypi.org/project/ruamel.yaml.clib/
-
- This package was split of from ruamel.yaml, so that ruamel.yaml can be build as
- a universal wheel. Apart from the C code seldom changing, and taking a long
- time to compile for all platforms, this allows installation of the .so
- on Linux systems under /usr/lib64/pythonX.Y (without a .pth file or a ruamel
- directory) and the Python code for ruamel.yaml under /usr/lib/pythonX.Y.
-
-
- .. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
- :target: https://bestpractices.coreinfrastructure.org/projects/1128
-
- .. image:: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_stati…
- :target: https://opensource.org/licenses/MIT
-
-
Keywords: yaml 1.2 parser c-library config
-Platform: UNKNOWN
Classifier: Development Status :: 4 - Beta
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
@@ -48,3 +21,30 @@
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Requires-Python: >=3.5
Description-Content-Type: text/x-rst
+License-File: LICENSE
+
+
+ruamel.yaml.clib
+================
+
+``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
+
+:version: 0.2.6
+:updated: 2021-07-04
+:documentation: http://yaml.readthedocs.io
+:repository: https://sourceforge.net/projects/ruamel-yaml-clib/
+:pypi: https://pypi.org/project/ruamel.yaml.clib/
+
+This package was split of from ruamel.yaml, so that ruamel.yaml can be build as
+a universal wheel. Apart from the C code seldom changing, and taking a long
+time to compile for all platforms, this allows installation of the .so
+on Linux systems under /usr/lib64/pythonX.Y (without a .pth file or a ruamel
+directory) and the Python code for ruamel.yaml under /usr/lib/pythonX.Y.
+
+
+.. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
+ :target: https://bestpractices.coreinfrastructure.org/projects/1128
+
+.. image:: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_stati…
+ :target: https://opensource.org/licenses/MIT
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/ruamel.yaml.clib.egg-info/SOURCES.txt new/ruamel.yaml.clib-0.2.7/ruamel.yaml.clib.egg-info/SOURCES.txt
--- old/ruamel.yaml.clib-0.2.6/ruamel.yaml.clib.egg-info/SOURCES.txt 2021-07-04 15:29:15.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.7/ruamel.yaml.clib.egg-info/SOURCES.txt 2022-10-20 09:03:37.000000000 +0200
@@ -11,6 +11,7 @@
parser.c
reader.c
scanner.c
+setup.cfg
setup.py
writer.c
yaml.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/setup.cfg new/ruamel.yaml.clib-0.2.7/setup.cfg
--- old/ruamel.yaml.clib-0.2.6/setup.cfg 2021-07-04 15:29:15.899298400 +0200
+++ new/ruamel.yaml.clib-0.2.7/setup.cfg 2022-10-20 09:03:37.748057600 +0200
@@ -1,3 +1,6 @@
+[metadata]
+license_file = LICENSE
+
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml.clib-0.2.6/setup.py new/ruamel.yaml.clib-0.2.7/setup.py
--- old/ruamel.yaml.clib-0.2.6/setup.py 2021-07-04 15:27:34.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.7/setup.py 2021-12-13 08:28:37.000000000 +0100
@@ -50,10 +50,6 @@
pass
-if sys.version_info >= (3, 8):
- from ast import Str, Num, Bytes, NameConstant # NOQA
-
-
if sys.version_info < (3,):
open_kw = dict()
else:
@@ -81,6 +77,9 @@
print('{:%Y-%d-%mT%H:%M:%S}'.format(datetime.datetime.now()), file=fp, end=' ')
print(*args, **kw1)
+if sys.version_info >= (3, 8):
+ from ast import Str, Num, Bytes, NameConstant # NOQA
+
def literal_eval(node_or_string):
"""
@@ -528,7 +527,7 @@
if package_name is None:
package_name = self.full_package_name
if not script_name:
- script_name = package_name.split('.')[-1]
+ script_name = package_name.rsplit('.', 1)[-1]
return {
'console_scripts': [
'{0} = {1}'.format(script_name, pckg_entry_point(package_name))
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-wheel for openSUSE:Factory checked in at 2022-11-01 13:40:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-wheel (Old)
and /work/SRC/openSUSE:Factory/.python-wheel.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-wheel"
Tue Nov 1 13:40:53 2022 rev:28 rq:1032420 version:0.37.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-wheel/python-wheel.changes 2022-10-27 13:53:43.196429045 +0200
+++ /work/SRC/openSUSE:Factory/.python-wheel.new.2275/python-wheel.changes 2022-11-01 13:41:00.067395880 +0100
@@ -1,0 +2,6 @@
+Sat Oct 29 15:57:58 UTC 2022 - Ben Greiner <code(a)bnavigator.de>
+
+- Revert to 0.37.1
+ * v0.38.0 has been yanked from PyPI
+
+-------------------------------------------------------------------
Old:
----
wheel-0.38.0.tar.gz
New:
----
wheel-0.37.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-wheel.spec ++++++
--- /var/tmp/diff_new_pack.V7qULD/_old 2022-11-01 13:41:01.835405286 +0100
+++ /var/tmp/diff_new_pack.V7qULD/_new 2022-11-01 13:41:01.839405307 +0100
@@ -31,18 +31,17 @@
%bcond_with test
%endif
Name: python-wheel%{psuffix}
-Version: 0.38.0
+Version: 0.37.1
Release: 0
Summary: A built-package format for Python
License: MIT
Group: Development/Languages/Python
URL: https://github.com/pypa/wheel
Source: https://github.com/pypa/wheel/archive/%{version}.tar.gz#/wheel-%{version}.t…
-BuildRequires: %{python_module base >= 3.8}
-BuildRequires: %{python_module setuptools >= 57.0.0}
+BuildRequires: %{python_module setuptools >= 40.9.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros >= 20210929
-Requires: python-setuptools >= 57.0.0
+Requires: python-setuptools >= 40.9.0
%if %{with libalternatives}
Requires: alts
BuildRequires: alts
@@ -107,7 +106,7 @@
%doc docs/news.rst README.rst
%license LICENSE.txt
%python_alternative %{_bindir}/wheel
-%{python_sitelib}/wheel-%{version}-py%{python_version}.egg-info
+%{python_sitelib}/wheel-%{version}*-info
%{python_sitelib}/wheel/
%endif
++++++ wheel-0.38.0.tar.gz -> wheel-0.37.1.tar.gz ++++++
++++ 6016 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yelp-tools for openSUSE:Factory checked in at 2022-11-01 13:40:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yelp-tools (Old)
and /work/SRC/openSUSE:Factory/.yelp-tools.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yelp-tools"
Tue Nov 1 13:40:51 2022 rev:33 rq:1032405 version:42.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yelp-tools/yelp-tools.changes 2022-03-23 20:18:19.566460986 +0100
+++ /work/SRC/openSUSE:Factory/.yelp-tools.new.2275/yelp-tools.changes 2022-11-01 13:40:58.759388921 +0100
@@ -1,0 +2,6 @@
+Mon Oct 31 08:37:08 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com>
+
+- Update to version 42.1:
+ + Fixed issue with DocBook when path is missing trailing slash.
+
+-------------------------------------------------------------------
Old:
----
yelp-tools-42.0.tar.xz
New:
----
yelp-tools-42.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yelp-tools.spec ++++++
--- /var/tmp/diff_new_pack.8XGVNa/_old 2022-11-01 13:40:59.255391560 +0100
+++ /var/tmp/diff_new_pack.8XGVNa/_new 2022-11-01 13:40:59.259391581 +0100
@@ -17,7 +17,7 @@
Name: yelp-tools
-Version: 42.0
+Version: 42.1
Release: 0
Summary: Collection of utilities to help create documentation
License: GPL-2.0-or-later
@@ -54,7 +54,7 @@
%files
%license COPYING
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README.md
%{_bindir}/yelp-build
%{_bindir}/yelp-check
%{_bindir}/yelp-new
++++++ yelp-tools-42.0.tar.xz -> yelp-tools-42.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-42.0/.gitignore new/yelp-tools-42.1/.gitignore
--- old/yelp-tools-42.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/yelp-tools-42.1/.gitignore 2022-10-30 21:20:28.000000000 +0100
@@ -0,0 +1,24 @@
+*~
+INSTALL
+Makefile
+Makefile.in
+
+/aclocal.m4
+/autom4te.cache
+/ChangeLog
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
+/install-sh
+/intltool-extract.in
+/intltool-merge.in
+/intltool-update.in
+/missing
+
+/tools/yelp-build
+/tools/yelp-check
+/tools/yelp-new
+/xslt/mal-ncx.xsl
+/xslt/mal-opf.xsl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-42.0/NEWS new/yelp-tools-42.1/NEWS
--- old/yelp-tools-42.0/NEWS 2022-03-19 16:35:35.419734500 +0100
+++ new/yelp-tools-42.1/NEWS 2022-10-30 21:20:28.000000000 +0100
@@ -1,3 +1,11 @@
+42.1
+====
+* Fixed issue with DocBook when path is missing trailing slash, #22
+
+42.0
+====
+* No changes since beta, stable release only
+
42.beta
=======
* yelp.m4: Avoid argument list too long error when cleaning (Dan Nicholson)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-42.0/README new/yelp-tools-42.1/README
--- old/yelp-tools-42.0/README 2022-03-19 16:35:35.420734600 +0100
+++ new/yelp-tools-42.1/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-ABOUT
-=====
-yelp-tools is a collection of scripts and build utilities to help create,
-manage, and publish documentation for Yelp and the web. Most of the heavy
-lifting is done by packages like yelp-xsl and itstool. This package just
-wraps things up in a developer-friendly way.
-
-
-ORGANIZATION
-============
-templates/
- The templates directory contains page templates used by yelp-new.
-
-tools/
- The tools directory contains scripts like yelp-build and yelp-check,
- as well as the yelp.m4 file that provides autotools integration.
-
-xslt/
- The xslt directory contains small utility XSLT files that are used
- by the various scripts shipped with yelp-tools. These stylesheets
- are not intended to be built upon.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-42.0/README.md new/yelp-tools-42.1/README.md
--- old/yelp-tools-42.0/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/yelp-tools-42.1/README.md 2022-10-30 21:20:28.000000000 +0100
@@ -0,0 +1,21 @@
+# Yelp Tools
+
+yelp-tools is a collection of scripts and build utilities to help create,
+manage, and publish documentation for Yelp and the web. Most of the heavy
+lifting is done by packages like yelp-xsl and itstool. This package just
+wraps things up in a developer-friendly way.
+
+
+## ORGANIZATION
+
+- `templates/`
+ The templates directory contains page templates used by yelp-new.
+
+- `tools/`
+ The tools directory contains scripts like yelp-build and yelp-check,
+ as well as the yelp.m4 file that provides autotools integration.
+
+- `xslt/`
+ The xslt directory contains small utility XSLT files that are used
+ by the various scripts shipped with yelp-tools. These stylesheets
+ are not intended to be built upon.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-42.0/meson.build new/yelp-tools-42.1/meson.build
--- old/yelp-tools-42.0/meson.build 2022-03-19 16:35:35.421734600 +0100
+++ new/yelp-tools-42.1/meson.build 2022-10-30 21:20:28.000000000 +0100
@@ -1,5 +1,5 @@
project('yelp-tools',
- version: '42.beta',
+ version: '42.1',
license: 'GPL-2.0-or-later',
meson_version: '>= 0.51.0',
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-42.0/tools/yelp-build.in new/yelp-tools-42.1/tools/yelp-build.in
--- old/yelp-tools-42.0/tools/yelp-build.in 2022-03-19 16:35:35.423734700 +0100
+++ new/yelp-tools-42.1/tools/yelp-build.in 2022-10-30 21:20:28.000000000 +0100
@@ -557,6 +557,9 @@
if not os.path.isdir(output):
print('Output must be a directory', file=sys.stderr)
return 1
+ if not output.endswith('/'):
+ # xsltproc is picky about this
+ output = output + '/'
if path is None:
path = self.get_option_list('path')
if path is None:
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gjs for openSUSE:Factory checked in at 2022-11-01 13:40:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gjs (Old)
and /work/SRC/openSUSE:Factory/.gjs.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gjs"
Tue Nov 1 13:40:50 2022 rev:106 rq:1032401 version:1.74.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/gjs/gjs.changes 2022-09-21 14:42:28.669762510 +0200
+++ /work/SRC/openSUSE:Factory/.gjs.new.2275/gjs.changes 2022-11-01 13:40:55.075369323 +0100
@@ -1,0 +2,11 @@
+Mon Oct 31 08:34:31 UTC 2022 - Bj��rn Lie <bjorn.lie(a)gmail.com>
+
+- Update to version 1.74.1:
+ + Closed bugs and merge requests:
+ - Problem calling promisified D-Bus wrappers with callback.
+ - docs:
+ . Fix link in issue template.
+ . Document Gio.FileEnumerator iteration.
+ . Fix Markdown formatting in README.MSVC.md.
+
+-------------------------------------------------------------------
Old:
----
gjs-1.74.0.tar.xz
New:
----
gjs-1.74.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gjs.spec ++++++
--- /var/tmp/diff_new_pack.NDonBx/_old 2022-11-01 13:40:57.435381878 +0100
+++ /var/tmp/diff_new_pack.NDonBx/_new 2022-11-01 13:40:57.439381899 +0100
@@ -17,7 +17,7 @@
Name: gjs
-Version: 1.74.0
+Version: 1.74.1
# FIXME # Disable tests for unstable 1.71.1 - Try tests again on next versionbump
Release: 0
Summary: JavaScript bindings based on gobject-introspection and Mozilla
++++++ gjs-1.74.0.tar.xz -> gjs-1.74.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/.gitlab/issue_templates/bug.md new/gjs-1.74.1/.gitlab/issue_templates/bug.md
--- old/gjs-1.74.0/.gitlab/issue_templates/bug.md 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/.gitlab/issue_templates/bug.md 2022-10-30 00:57:47.000000000 +0200
@@ -25,7 +25,7 @@
If GJS or GNOME Shell crashed, please include a stack trace.
For information on how to get a stack trace,
-[read this wiki page](https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTrace….
+[read this wiki page](https://wiki.gnome.org/GettingInTouch/Bugzilla/GettingTraces/Details).
## Expected behaviour ##
What did you expect to see instead?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/NEWS new/gjs-1.74.1/NEWS
--- old/gjs-1.74.0/NEWS 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/NEWS 2022-10-30 00:57:47.000000000 +0200
@@ -1,3 +1,13 @@
+Version 1.74.1
+--------------
+
+- Closed bugs and merge requests:
+ * Problem calling promisified D-Bus wrappers with callback [#494, !790, Marco
+ Trevisan]
+ * docs: Fix link in issue template [!799, Jan Tojnar]
+ * doc: Document Gio.FileEnumerator iteration [!800, Sonny Piers]
+ * doc: Fix Markdown formatting in README.MSVC.md [!803, Kisaragi Hiu]
+
Version 1.74.0
--------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/README.MSVC.md new/gjs-1.74.1/README.MSVC.md
--- old/gjs-1.74.0/README.MSVC.md 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/README.MSVC.md 2022-10-30 00:57:47.000000000 +0200
@@ -13,15 +13,15 @@
You will need the following items to build GJS using Visual Studio
or clang-cl (they can be built with Visual Studio 2015 or later,
unless otherwise noted):
--SpiderMonkey 102.x (mozjs-102). This must be built with clang-cl as
- the Visual Studio compiler is no longer supported for building this.
- Please see the below section carefully on this...
--GObject-Introspection (G-I) 1.61.2 or later
--GLib 2.58.x or later, (which includes GIO, GObject, and the
- associated tools)
--Cairo including Cairo-GObject support (Optional)
--GTK+-3.20.x or later (Optional)
--and anything that the above items depend on.
+- SpiderMonkey 102.x (mozjs-102). This must be built with clang-cl as
+ the Visual Studio compiler is no longer supported for building this.
+ Please see the below section carefully on this...
+- GObject-Introspection (G-I) 1.61.2 or later
+- GLib 2.58.x or later, (which includes GIO, GObject, and the
+ associated tools)
+- Cairo including Cairo-GObject support (Optional)
+- GTK+-3.20.x or later (Optional)
+- and anything that the above items depend on.
Note again that SpiderMonkey must be built using Visual Studio with
clang-cl, and the rest should preferably be built with Visual Studio
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/doc/Overrides.md new/gjs-1.74.1/doc/Overrides.md
--- old/gjs-1.74.0/doc/Overrides.md 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/doc/Overrides.md 2022-10-30 00:57:47.000000000 +0200
@@ -50,7 +50,7 @@
```
[gdbusconnection]: https://gjs-docs.gnome.org/gio20/gio.dbusconnection
-
+
### Gio.DBusNodeInfo.new_for_xml(xmlData)
Type:
@@ -93,7 +93,7 @@
common case of a [`Gio.DBusNodeInfo`][gdbusnodeinfo] with a single interface.
[gdbusinterfaceinfo]: https://gjs-docs.gnome.org/gio20/gio.dbusinterfaceinfo
-
+
### Gio.DBusProxy.makeProxyWrapper(interfaceInfo)
Type:
@@ -133,7 +133,7 @@
[gdbusproxy]: https://gjs-docs.gnome.org/gio20/gio.dbusproxy
[make-proxy-wrapper]: https://gjs.guide/guides/gio/dbus.html#high-level-proxies
-
+
### Gio.DBusExportedObject.wrapJSObject(interfaceInfo, jsObj)
Type:
@@ -157,7 +157,7 @@
* `emit_property_changed(propertyName, propertyValue)`
* propertyName (`String`) ��� A D-Bus property name
* propertyValue (`GLib.Variant`) ��� A [`GLib.Variant`][gvariant]
-
+
* `emit_signal(signalName, signalParameters)`
* signalName (`String`) ��� A D-Bus signal name
* signalParameters (`GLib.Variant`) ��� A [`GLib.Variant`][gvariant]
@@ -180,7 +180,7 @@
* prototype (`Object`) ��� The prototype of a GObject class
* startFunc (`Function`) ��� The "async" or "start" method
* finishFunc (`Function`) ��� The "finish" method
-
+
Replaces the original `startFunc` on a GObject class prototype, so that it
returns a `Promise` and can be used as a JavaScript `async` function.
@@ -200,6 +200,55 @@
}
```
+### Gio.FileEnumerator[Symbol.asyncIterator]
+
+[Gio.FileEnumator](gio-fileenumerator) are [async iterators](async-iterators).
+
+Each iteration returns a [Gio.FileInfo](gio-fileinfo):
+
+```js
+import Gio from "gi://Gio";
+
+const dir = Gio.File.new_for_path("/");
+const enumerator = dir.enumerate_children(
+ "standard::name",
+ Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS,
+ null
+);
+
+for await (const file_info of enumerator) {
+ console.log(file_info.get_name());
+}
+```
+
+[gio-fileenumerator]: https://gjs-docs.gnome.org/gio20/gio.fileenumerator
+[async-iterator]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Iteration_proto…
+[gio-fileinfo]: https://gjs-docs.gnome.org/gio20/gio.fileinfo
+
+### Gio.FileEnumerator[Symbol.iterator]
+
+[Gio.FileEnumator](gio-fileenumerator) are [sync iterators](sync-iterators).
+
+Each iteration returns a [Gio.FileInfo](gio-fileinfo):
+
+```js
+import Gio from "gi://Gio";
+
+const dir = Gio.File.new_for_path("/");
+const enumerator = dir.enumerate_children(
+ "standard::name",
+ Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS,
+ null
+);
+
+for (const file_info of enumerator) {
+ console.log(file_info.get_name());
+}
+```
+
+[gio-fileenumerator]: https://gjs-docs.gnome.org/gio20/gio.fileenumerator
+[sync-iterator]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Iteration_proto…
+[gio-fileinfo]: https://gjs-docs.gnome.org/gio20/gio.fileinfo
## [GLib](https://gitlab.gnome.org/GNOME/gjs/blob/HEAD/modules/core/overrides/G…
@@ -720,7 +769,7 @@
for (let pspec of properties)
log(pspec.name);
-
+
// Calling on a widget class
const properties = Gtk.Container.list_child_properties.call(Gtk.Box);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/installed-tests/js/testGDBus.js new/gjs-1.74.1/installed-tests/js/testGDBus.js
--- old/gjs-1.74.0/installed-tests/js/testGDBus.js 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/installed-tests/js/testGDBus.js 2022-10-30 00:57:47.000000000 +0200
@@ -837,3 +837,54 @@
expect(invalidatedProps).toContain('PropReadOnly');
});
});
+
+
+describe('DBus Proxy wrapper', function () {
+ let loop;
+ let wasPromise;
+ let writerFunc;
+
+ beforeAll(function () {
+ loop = new GLib.MainLoop(null, false);
+
+ wasPromise = Gio.DBusProxy.prototype._original_init_async instanceof Function;
+ Gio._promisify(Gio.DBusProxy.prototype, 'init_async');
+
+ writerFunc = jasmine.createSpy(
+ 'log writer func', (level, fields) => {
+ const decoder = new TextDecoder('utf-8');
+ const domain = decoder.decode(fields?.GLIB_DOMAIN);
+ const message = `${decoder.decode(fields?.MESSAGE)}\n`;
+ level |= GLib.LogLevelFlags.FLAG_RECURSION;
+ GLib.log_default_handler(domain, level, message, null);
+ return GLib.LogWriterOutput.HANDLED;
+ });
+
+ writerFunc.and.callThrough();
+ GLib.log_set_writer_func(writerFunc);
+ });
+
+ beforeEach(function () {
+ writerFunc.calls.reset();
+ });
+
+ it('can init a proxy asynchronously when promisified', function () {
+ new ProxyClass(Gio.DBus.session, 'org.gnome.gjs.Test',
+ '/org/gnome/gjs/Test',
+ () => loop.quit(),
+ Gio.DBusProxyFlags.NONE);
+ loop.run();
+
+ expect(writerFunc).not.toHaveBeenCalled();
+ });
+
+ afterAll(function () {
+ if (!wasPromise) {
+ // Remove stuff added by Gio._promisify, this can be not needed in future
+ // nor should break other tests, but we didn't want to depend on those.
+ expect(Gio.DBusProxy.prototype._original_init_async).toBeInstanceOf(Function);
+ Gio.DBusProxy.prototype.init_async = Gio.DBusProxy.prototype._original_init_async;
+ delete Gio.DBusProxy.prototype._original_init_async;
+ }
+ });
+});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/meson.build new/gjs-1.74.1/meson.build
--- old/gjs-1.74.0/meson.build 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/meson.build 2022-10-30 00:57:47.000000000 +0200
@@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2019 Philip Chimento <philip.chimento(a)gmail.com>
# SPDX-FileCopyrightText: 2019 Chun-wei Fan <fanchunwei(a)src.gnome.org>
-project('gjs', 'cpp', 'c', version: '1.74.0', license: ['MIT', 'LGPL2+'],
+project('gjs', 'cpp', 'c', version: '1.74.1', license: ['MIT', 'LGPL2+'],
meson_version: '>= 0.54.0',
default_options: ['cpp_std=c++17', 'cpp_rtti=false', 'c_std=c99',
'warning_level=2', 'b_pch=true' ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.74.0/modules/core/overrides/Gio.js new/gjs-1.74.1/modules/core/overrides/Gio.js
--- old/gjs-1.74.0/modules/core/overrides/Gio.js 2022-09-21 05:19:18.000000000 +0200
+++ new/gjs-1.74.1/modules/core/overrides/Gio.js 2022-10-30 00:57:47.000000000 +0200
@@ -517,6 +517,7 @@
};
_injectToMethod(Gio.DBusProxy.prototype, 'init', _addDBusConvenience);
+ _promisify(Gio.DBusProxy.prototype, 'init_async');
_injectToMethod(Gio.DBusProxy.prototype, 'init_async', _addDBusConvenience);
_injectToStaticMethod(Gio.DBusProxy, 'new_sync', _addDBusConvenience);
_injectToStaticMethod(Gio.DBusProxy, 'new_finish', _addDBusConvenience);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-maps for openSUSE:Factory checked in at 2022-11-01 13:40:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-maps (Old)
and /work/SRC/openSUSE:Factory/.gnome-maps.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-maps"
Tue Nov 1 13:40:48 2022 rev:75 rq:1032392 version:43.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-maps/gnome-maps.changes 2022-10-25 11:18:52.313985639 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-maps.new.2275/gnome-maps.changes 2022-11-01 13:40:52.667356513 +0100
@@ -1,0 +2,6 @@
+Fri Oct 28 14:55:12 UTC 2022 - Michael Gorse <mgorse(a)suse.com>
+
+- Add gnome-maps-icu72.patch: fix comparisons in time tests
+ (glgo#GNOME/gnome-maps!261).
+
+-------------------------------------------------------------------
New:
----
gnome-maps-icu72.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-maps.spec ++++++
--- /var/tmp/diff_new_pack.JCXwNi/_old 2022-11-01 13:40:53.903363088 +0100
+++ /var/tmp/diff_new_pack.JCXwNi/_new 2022-11-01 13:40:53.911363131 +0100
@@ -26,6 +26,8 @@
Source0: https://download.gnome.org/sources/gnome-maps/43/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-maps-fix-dependency.patch -- Fix upstream dodo when setting dependency for libshumate
Patch0: gnome-maps-fix-dependency.patch
+# PATCH-FIX-UPSTREAM gnome-maps-icu72.patch mgorse(a)suse.com -- fix comparisons in time tests.
+Patch1: gnome-maps-icu72.patch
BuildRequires: appstream-glib
BuildRequires: desktop-file-utils
++++++ gnome-maps-icu72.patch ++++++
From bec3d2f26de1b3a8c8b7e603f6d6a46c853426fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea(a)hotmail.com>
Date: Fri, 28 Oct 2022 01:05:28 +0200
Subject: [PATCH 1/2] tests/timeTest: Fix tests for time formats with different
kind of spaces
Time.format does not warranty the character used for spaces, neither
that it will not introduce preceding byte order marks. Solve it by
comparing inclusion of the data and that it finishes with AM or PM.
Closes #506
---
tests/timeTest.js | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/tests/timeTest.js b/tests/timeTest.js
index 96803f2f..d025e8e8 100644
--- a/tests/timeTest.js
+++ b/tests/timeTest.js
@@ -23,6 +23,11 @@ const JsUnit = imports.jsUnit;
import * as Time from './time.js';
+function compare12HourTime(format, hoursMinutes, AMPM) {
+ JsUnit.assertTrue(format.includes(hoursMinutes));
+ JsUnit.assertTrue(format.endsWith(AMPM));
+}
+
function formatTimeWithTZOffsetTest() {
// mock to always use 24 hour format
Time._setIs12HourFunction(() => { return false; });
@@ -35,8 +40,8 @@ function formatTimeWithTZOffsetTest() {
// mock to always use 12 hour format
Time._setIs12HourFunction(() => { return true; });
- JsUnit.assertEquals('10:54 PM',
- Time.formatTimeWithTZOffset(1607982864000, 3600000));
+ compare12HourTime(Time.formatTimeWithTZOffset(1607982864000, 3600000),
+ '10:54', 'PM');
}
function formatTimeFromHoursAndMinsTest() {
@@ -50,9 +55,9 @@ function formatTimeFromHoursAndMinsTest() {
// mock to always use 12 hour format
Time._setIs12HourFunction(() => { return true; });
- JsUnit.assertEquals('12:34 PM', Time.formatTimeFromHoursAndMins(12, 34));
- JsUnit.assertEquals('12:00 AM', Time.formatTimeFromHoursAndMins(24, 0));
- JsUnit.assertEquals('12:01 PM', Time.formatTimeFromHoursAndMins(12, 1));
+ compare12HourTime(Time.formatTimeFromHoursAndMins(12, 34), '12:34', 'PM');
+ compare12HourTime(Time.formatTimeFromHoursAndMins(24, 0), '12:00', 'AM');
+ compare12HourTime(Time.formatTimeFromHoursAndMins(12, 1), '12:01', 'PM');
}
formatTimeWithTZOffsetTest();
--
2.38.0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package at-spi2-core for openSUSE:Factory checked in at 2022-11-01 13:40:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/at-spi2-core (Old)
and /work/SRC/openSUSE:Factory/.at-spi2-core.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi2-core"
Tue Nov 1 13:40:46 2022 rev:99 rq:1032391 version:2.46.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/at-spi2-core/at-spi2-core.changes 2022-09-21 14:40:37.277453581 +0200
+++ /work/SRC/openSUSE:Factory/.at-spi2-core.new.2275/at-spi2-core.changes 2022-11-01 13:40:50.891347064 +0100
@@ -1,0 +2,5 @@
+Fri Oct 28 13:17:53 UTC 2022 - Frederic Crozat <fcrozat(a)suse.com>
+
+- Ensure xprop is required when xwayland is installed.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi2-core.spec ++++++
--- /var/tmp/diff_new_pack.JnA2QH/_old 2022-11-01 13:40:51.467350129 +0100
+++ /var/tmp/diff_new_pack.JnA2QH/_new 2022-11-01 13:40:51.471350150 +0100
@@ -45,6 +45,8 @@
Requires: dbus-1
Provides: at-spi2-atk-gtk2 = %{version}
Obsoletes: at-spi2-atk-gtk2 < %{version}
+# xprop is needed when using XWayland
+Requires: (xprop if xwayland)
%description
AT-SPI is a general interface for applications to make use of the
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kio for openSUSE:Factory checked in at 2022-11-01 13:40:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kio (Old)
and /work/SRC/openSUSE:Factory/.kio.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio"
Tue Nov 1 13:40:44 2022 rev:133 rq:1032388 version:5.99.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kio/kio.changes 2022-10-11 18:01:59.905740345 +0200
+++ /work/SRC/openSUSE:Factory/.kio.new.2275/kio.changes 2022-11-01 13:40:48.579334766 +0100
@@ -1,0 +2,7 @@
+Thu Oct 27 10:44:41 UTC 2022 - Ben Greiner <code(a)bnavigator.de>
+
+- Add kio-mr1008-fix-webdav.diff
+ * Fixes WebDAV upload (kde#460717)
+ * https://invent.kde.org/frameworks/kio/-/merge_requests/1008
+
+-------------------------------------------------------------------
New:
----
kio-mr1008-fix-webdav.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kio.spec ++++++
--- /var/tmp/diff_new_pack.bnKeQx/_old 2022-11-01 13:40:50.371344299 +0100
+++ /var/tmp/diff_new_pack.bnKeQx/_new 2022-11-01 13:40:50.375344319 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kio
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,12 +36,14 @@
%endif
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch
+# PATCH-FIX-UPSTREAM kio-mr1008-fix-webdav.diff kde#460717, https://invent.kde.org/frameworks/kio/-/merge_requests/1008
+Patch1: https://invent.kde.org/frameworks/kio/-/commit/501091059ae9fc2877d621cdbc0f…
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
# gcc7 is too old for std::transform_reduce
%if 0%{?suse_version} == 1500
-BuildRequires: gcc10-c++
BuildRequires: gcc10-PIE
+BuildRequires: gcc10-c++
%endif
BuildRequires: kf5-filesystem
BuildRequires: krb5-devel
++++++ kio-mr1008-fix-webdav.diff ++++++
diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
index ec3c8809f70fae7331d7d4871a2203be6d94204a..c54e568d28febc094b0aa5445b18a52eb0ff44f3 100644
--- a/src/ioslaves/http/http.cpp
+++ b/src/ioslaves/http/http.cpp
@@ -5522,7 +5522,7 @@ bool HTTPProtocol::davDestinationExists()
m_request.cacheTag.policy = CC_Reload;
m_request.davData.depth = 0;
- (void)/* handling result via response codes */ (true);
+ (void)/* handling result via response codes */proceedUntilResponseContent(true);
if (!m_request.isKeepAlive) {
httpCloseConnection(); // close connection if server requested it.
1
0