diff options
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/ipautil.py | 10 | ||||
| -rw-r--r-- | ipapython/nsslib.py | 5 | ||||
| -rw-r--r-- | ipapython/sysrestore.py | 5 |
3 files changed, 4 insertions, 16 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 64901b524..62d029d41 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -519,20 +519,14 @@ def nolog_replace(string, nolog): def file_exists(filename): try: mode = os.stat(filename)[stat.ST_MODE] - if stat.S_ISREG(mode): - return True - else: - return False + return bool(stat.S_ISREG(mode)) except Exception: return False def dir_exists(filename): try: mode = os.stat(filename)[stat.ST_MODE] - if stat.S_ISDIR(mode): - return True - else: - return False + return bool(stat.S_ISDIR(mode)) except Exception: return False diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py index b5e5b6586..1573de96f 100644 --- a/ipapython/nsslib.py +++ b/ipapython/nsslib.py @@ -74,10 +74,7 @@ def auth_certificate_callback(sock, check_sig, is_server, certdb): ', '.join(nss.cert_usage_flags(intended_usage))) # Is the intended usage a proper subset of the approved usage - if approved_usage & intended_usage: - cert_is_valid = True - else: - cert_is_valid = False + cert_is_valid = bool(approved_usage & intended_usage) # If this is a server, we're finished if is_server or not cert_is_valid: diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py index e0d090856..cd09caee5 100644 --- a/ipapython/sysrestore.py +++ b/ipapython/sysrestore.py @@ -437,7 +437,4 @@ class StateFile: Can be used to determine if a service is configured. """ - if module in self.modules: - return True - else: - return False + return module in self.modules |