sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't catch that many exceptions

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-12-30 16:53:03 +01:00
parent e8254f489e
commit b3e649d1b3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vdirsyncer/storage/dav.py
View file

@ -13,6 +13,7 @@ import itertools
from lxml import etree from lxml import etree
from requests import session as requests_session from requests import session as requests_session
from requests.exception import RequestException
from .base import Item, Storage from .base import Item, Storage
from .http import USERAGENT, prepare_auth, prepare_verify from .http import USERAGENT, prepare_auth, prepare_verify
@ -70,7 +71,7 @@ def _catch_generator_exceptions(f):
try: try:
for x in f(*args, **kwargs): for x in f(*args, **kwargs):
yield x yield x
except Exception: except RequestException:
import traceback import traceback
dav_logger.debug(traceback.format_exc()) dav_logger.debug(traceback.format_exc())
return inner return inner
@ -121,8 +122,9 @@ class Discover(object):
@_catch_generator_exceptions @_catch_generator_exceptions
def _find_dav(self): def _find_dav(self):
response = self.session.request('GET', self._well_known_uri, response = self.session.request('GET', self._well_known_uri,
allow_redirects=False) allow_redirects=False,
yield response.headers['Location'] is_subpath=False)
yield response.headers.get('Location', '')
def discover(self): def discover(self):
"""discover all the user's CalDAV or CardDAV collections on the server """discover all the user's CalDAV or CardDAV collections on the server