vdirsyncer: cherry pick Python 3.9 fixes.

This commit is contained in:
Olaf Mersmann 2020-10-14 11:52:07 +02:00 committed by Andrew J. Hesford
parent 5e97be8098
commit 2622957318
2 changed files with 20 additions and 1 deletions

View file

@ -0,0 +1,19 @@
Source: Upstream
Upstream: Yes
Reason: Python 3.9 compatibility fix.
diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
index 07d164f..a7e2422 100644
--- vdirsyncer/storage/dav.py
+++ vdirsyncer/storage/dav.py
@@ -124,7 +124,7 @@ def _merge_xml(items):
return None
rv = items[0]
for item in items[1:]:
- rv.extend(item.getiterator())
+ rv.extend(item.iter())
return rv
--
2.28.0

View file

@ -1,7 +1,7 @@
# Template file for 'vdirsyncer' # Template file for 'vdirsyncer'
pkgname=vdirsyncer pkgname=vdirsyncer
version=0.16.8 version=0.16.8
revision=2 revision=3
build_style=python3-module build_style=python3-module
hostmakedepends="python3-setuptools" hostmakedepends="python3-setuptools"
depends="python3-atomicwrites python3-click python3-click-log depends="python3-atomicwrites python3-click python3-click-log