tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reformat offlineimap/utils/distro.py

Browse Source 
Add some spaces, remove lines,... now format is better (lintian).
This commit is contained in:
Rodolfo García Peñas (kix) 2020-08-29 20:01:52 +02:00
parent 5d482a67ff
commit 5a81eccb49
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
offlineimap/utils/distro.py
View File

@ -5,7 +5,6 @@
import platform import platform
import os import os
# Each dictionary value is either string or some iterable. # Each dictionary value is either string or some iterable.
# #
# For the former we will just return the value, for an iterable # For the former we will just return the value, for an iterable
@ -16,10 +15,10 @@ __DEF_OS_LOCATIONS = {
'openbsd': '/etc/ssl/cert.pem', 'openbsd': '/etc/ssl/cert.pem',
'dragonfly': '/etc/ssl/cert.pem', 'dragonfly': '/etc/ssl/cert.pem',
'darwin': [ 'darwin': [
# MacPorts, port curl-ca-bundle # MacPorts, port curl-ca-bundle
'/opt/local/share/curl/curl-ca-bundle.crt', '/opt/local/share/curl/curl-ca-bundle.crt',
# homebrew, package openssl # homebrew, package openssl
'/usr/local/etc/openssl/cert.pem', '/usr/local/etc/openssl/cert.pem',
], ],
'linux-ubuntu': '/etc/ssl/certs/ca-certificates.crt', 'linux-ubuntu': '/etc/ssl/certs/ca-certificates.crt',
'linux-debian': '/etc/ssl/certs/ca-certificates.crt', 'linux-debian': '/etc/ssl/certs/ca-certificates.crt',
@ -54,6 +53,7 @@ def get_os_name():
return OS return OS
def get_os_sslcertfile_searchpath(): def get_os_sslcertfile_searchpath():
"""Returns search path for CA bundle for the current OS. """Returns search path for CA bundle for the current OS.
@ -71,7 +71,7 @@ def get_os_sslcertfile_searchpath():
if OS in __DEF_OS_LOCATIONS: if OS in __DEF_OS_LOCATIONS:
l = __DEF_OS_LOCATIONS[OS] l = __DEF_OS_LOCATIONS[OS]
if not hasattr(l, '__iter__'): if not hasattr(l, '__iter__'):
l = (l, ) l = (l,)
return l return l
@ -90,9 +90,8 @@ def get_os_sslcertfile():
return None return None
for f in l: for f in l:
assert (type(f) == type("")) assert (type(f) == type(""))
if os.path.exists(f) and \ if os.path.exists(f) and (os.path.isfile(f) or os.path.islink(f)):
(os.path.isfile(f) or os.path.islink(f)): return f
return f
return None return None