Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-vdirsyncer for
openSUSE:Factory checked in at 2021-06-01 10:39:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-vdirsyncer (Old)
and /work/SRC/openSUSE:Factory/.python-vdirsyncer.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-vdirsyncer"
Tue Jun 1 10:39:41 2021 rev:14 rq:896413 version:0.16.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-vdirsyncer/python-vdirsyncer.changes
2021-04-12 17:10:22.466565641 +0200
+++
/work/SRC/openSUSE:Factory/.python-vdirsyncer.new.1898/python-vdirsyncer.changes
2021-06-01 10:41:14.737199574 +0200
@@ -1,0 +2,7 @@
+Mon May 31 15:07:46 UTC 2021 - Matej Cepl <[email protected]>
+
+- Add deprecated_getiterator.patch (.getiterator() in
+ etree.Element is obsolete, use just plain iter())
+ gh#pimutils/vdirsyncer#880
+
+-------------------------------------------------------------------
New:
----
deprecated_getiterator.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-vdirsyncer.spec ++++++
--- /var/tmp/diff_new_pack.HE8Z5V/_old 2021-06-01 10:41:15.149200275 +0200
+++ /var/tmp/diff_new_pack.HE8Z5V/_new 2021-06-01 10:41:15.149200275 +0200
@@ -32,6 +32,9 @@
Patch1: python-vdirsyncer-shift-deadline.patch
# Compatibility with latest click - taken directly from upstream git
Patch2: 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch
+# PATCH-FIX-UPSTREAM deprecated_getiterator.patch gh#pimutils/vdirsyncer#880
[email protected]
+# .getiterator() in etree.Element is obsolete, use just plain iter()
+Patch0: deprecated_getiterator.patch
BuildRequires: %{python_module atomicwrites}
BuildRequires: %{python_module setuptools_scm}
BuildRequires: fdupes
@@ -71,9 +74,8 @@
what OfflineIMAP is for IMAP.
%prep
-%setup -q -n vdirsyncer-%{version}
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1 -n vdirsyncer-%{version}
+
rm -rf vdirsyncer.egg-info
%build
++++++ 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch ++++++
--- /var/tmp/diff_new_pack.HE8Z5V/_old 2021-06-01 10:41:15.173200315 +0200
+++ /var/tmp/diff_new_pack.HE8Z5V/_new 2021-06-01 10:41:15.173200315 +0200
@@ -4,15 +4,13 @@
Subject: [PATCH] Add compatibility with latest click
---
- setup.py | 2 +-
- tests/system/cli/test_sync.py | 5 ++++-
+ setup.py | 2 +-
+ tests/system/cli/test_sync.py | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
-diff --git a/setup.py b/setup.py
-index 59549f16..d584b95d 100644
--- a/setup.py
+++ b/setup.py
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ from setuptools import Command, find_pac
requirements = [
# https://github.com/mitsuhiko/click/issues/200
@@ -21,11 +19,9 @@
'click-log>=0.3.0, <0.4.0',
# https://github.com/pimutils/vdirsyncer/issues/478
-diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
-index f2423764..43d35dd8 100644
--- a/tests/system/cli/test_sync.py
+++ b/tests/system/cli/test_sync.py
-@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
+@@ -122,7 +122,10 @@ def test_verbosity(tmpdir, runner):
runner.write_with_general('')
result = runner.invoke(['--verbosity=HAHA', 'sync'])
assert result.exception
++++++ deprecated_getiterator.patch ++++++
---
vdirsyncer/storage/dav.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -120,7 +120,7 @@ def _merge_xml(items):
return None
rv = items[0]
for item in items[1:]:
- rv.extend(item.getiterator())
+ rv.extend(iter(item))
return rv
