diff --git a/offlineimap/repository/IMAP.py b/offlineimap/repository/IMAP.py index 0d5d9ce..a6c330e 100644 --- a/offlineimap/repository/IMAP.py +++ b/offlineimap/repository/IMAP.py @@ -247,7 +247,6 @@ class IMAPRepository(BaseRepository): the above behaviour, so any explicitely-requested configuration that doesn't result in an existing file will give an exception. """ - xforms = [os.path.expanduser, os.path.expandvars, os.path.abspath] cacertfile = self.getconf_xform('sslcacertfile', xforms, None) # Can't use above cacertfile because of abspath. diff --git a/offlineimap/utils/distro_utils.py b/offlineimap/utils/distro_utils.py index 6a81fcc..5b1cbac 100644 --- a/offlineimap/utils/distro_utils.py +++ b/offlineimap/utils/distro_utils.py @@ -74,8 +74,7 @@ def get_os_sslcertfile_searchpath(): location = None if os_name in __DEF_OS_LOCATIONS: location = __DEF_OS_LOCATIONS[os_name] - if not hasattr(location, '__iter__'): - location = (location,) + return location