get_os_sslcertfile_searchpath do not check iterable

Now, location is always an iterable, so we don't need check it.
This commit is contained in:
Rodolfo García Peñas (kix) 2020-10-25 17:32:38 +01:00
parent a1f8576937
commit 47f7b1ba3c
2 changed files with 1 additions and 3 deletions

View File

@ -247,7 +247,6 @@ class IMAPRepository(BaseRepository):
the above behaviour, so any explicitely-requested configuration the above behaviour, so any explicitely-requested configuration
that doesn't result in an existing file will give an exception. that doesn't result in an existing file will give an exception.
""" """
xforms = [os.path.expanduser, os.path.expandvars, os.path.abspath] xforms = [os.path.expanduser, os.path.expandvars, os.path.abspath]
cacertfile = self.getconf_xform('sslcacertfile', xforms, None) cacertfile = self.getconf_xform('sslcacertfile', xforms, None)
# Can't use above cacertfile because of abspath. # Can't use above cacertfile because of abspath.

View File

@ -74,8 +74,7 @@ def get_os_sslcertfile_searchpath():
location = None location = None
if os_name in __DEF_OS_LOCATIONS: if os_name in __DEF_OS_LOCATIONS:
location = __DEF_OS_LOCATIONS[os_name] location = __DEF_OS_LOCATIONS[os_name]
if not hasattr(location, '__iter__'):
location = (location,)
return location return location