Accepting request 896413 from devel:languages:python

- Add deprecated_getiterator.patch (.getiterator() in
  etree.Element is obsolete, use just plain iter())
  gh#pimutils/vdirsyncer#880

OBS-URL: https://build.opensuse.org/request/show/896413
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-vdirsyncer?expand=0&rev=14

3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch

@@ -4,15 +4,13 @@ Date: Tue, 9 Jun 2020 14:45:02 +0200
 Subject: [PATCH] Add compatibility with latest click
 
 ---
- setup.py                      | 2 +-
+ setup.py                      |    2 +-
- tests/system/cli/test_sync.py | 5 ++++-
+ 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 @@ index 59549f16..d584b95d 100644
      '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

@@ -0,0 +1,15 @@
+---
+ 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
+ 
+ 

python-vdirsyncer.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 31 15:07:46 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Add deprecated_getiterator.patch (.getiterator() in
+  etree.Element is obsolete, use just plain iter())
+  gh#pimutils/vdirsyncer#880
+
 -------------------------------------------------------------------
 Tue Apr 12 06:56:05 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
 

python-vdirsyncer.spec

@@ -32,6 +32,9 @@ Source2:        vdirsyncer.timer
 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 mcepl@suse.com
+# .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 @@ resources, vdir and some more. It aims to be for CalDAV and CardDAV
 what OfflineIMAP is for IMAP.
 
 %prep
-%setup -q -n vdirsyncer-%{version}
+%autosetup -p1 -n vdirsyncer-%{version}
-%patch1 -p1
+
-%patch2 -p1
 rm -rf vdirsyncer.egg-info
 
 %build