Hi Jelmer, On Mon, May 16, 2016 at 04:22:42PM +0000, Jelmer Vernooij wrote: > From: Jelmer Vernooij <jel...@jelmer.uk> > > --- > calypso/webdav.py | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/calypso/webdav.py b/calypso/webdav.py > index d74ecd5..ef102fc 100644 > --- a/calypso/webdav.py > +++ b/calypso/webdav.py > @@ -35,6 +35,7 @@ import tempfile > import vobject > import re > import subprocess > +import vobject.base > > import ConfigParser > > @@ -171,7 +172,11 @@ class Item(object): > Text is the serialized form of the item. > > """ > - return self.object.serialize().decode('utf-8') > + try: > + return self.object.serialize().decode('utf-8') > + except vobject.base.ValidateError, e: > + self.log.warn('Validation error %s in %s', e, self.urlpath) > + return self.object.serialize(validate=False).decode('utf-8')
LGTM. I thing we should switch to the python3 compatible "except Exc as e" from now on though. Cheers, -- Guido _______________________________________________ Calypso mailing list Calypso@keithp.com http://keithp.com/mailman/listinfo/calypso