From 71ec4d4e2a8d4c3fa2c5c6ac1868bf323fbed636 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 4 Apr 2018 15:11:34 +0200
Subject: [PATCH] Incorporate "Use os.path.isfile() and isdir()" from freeipa
upstream
b29db07c3b3d8937f53684fdbba985fec525d69d by Christian Heimes
Replace custom file_exists() and dir_exists() functions with proper
functions from Python's stdlib.
The change also gets rid of pylint's invalid bad-python3-import error,
https://github.com/PyCQA/pylint/issues/1565
---
library/ipasssd.py | 4 ++--
module_utils/ansible_ipa_client.py | 2 +-
roles/ipaserver/library/ipaserver_load_cache.py | 2 +-
roles/ipaserver/library/ipaserver_test.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/library/ipasssd.py b/library/ipasssd.py
index 3b2a567f..4320a6bc 100644
--- a/library/ipasssd.py
+++ b/library/ipasssd.py
@@ -201,8 +201,8 @@ def main():
if on_master:
sssd_enable_service(module, sssdconfig, 'ifp')
- if (("ssh" in services and file_exists(paths.SSH_CONFIG)) or
- ("sshd" in services and file_exists(paths.SSHD_CONFIG))):
+ if (("ssh" in services and os.path.isfile(paths.SSH_CONFIG)) or
+ ("sshd" in services and os.path.isfile(paths.SSHD_CONFIG))):
sssd_enable_service(module, sssdconfig, 'ssh')
if "sudo" in services:
diff --git a/module_utils/ansible_ipa_client.py b/module_utils/ansible_ipa_client.py
index 2e58d1b3..0839770c 100644
--- a/module_utils/ansible_ipa_client.py
+++ b/module_utils/ansible_ipa_client.py
@@ -69,7 +69,7 @@ if NUM_VERSION >= 40400:
if NUM_VERSION >= 40500 and NUM_VERSION < 40590:
from cryptography.hazmat.primitives import serialization
from ipapython.ipautil import CalledProcessError, write_tmp_file, \
- ipa_generate_password, file_exists
+ ipa_generate_password
from ipapython.dn import DN
try:
from ipalib.install.kinit import kinit_keytab, kinit_password
diff --git a/roles/ipaserver/library/ipaserver_load_cache.py b/roles/ipaserver/library/ipaserver_load_cache.py
index ae805d3f..1c5fa7f0 100644
--- a/roles/ipaserver/library/ipaserver_load_cache.py
+++ b/roles/ipaserver/library/ipaserver_load_cache.py
@@ -68,7 +68,7 @@ def main():
# restore cache #########################################################
- if ipautil.file_exists(paths.ROOT_IPA_CACHE):
+ if os.path.isfile(paths.ROOT_IPA_CACHE):
if options.dm_password is None:
ansible_module.fail_json(msg="Directory Manager password required")
try:
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 5d96b190..975df0da 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -399,7 +399,7 @@ def main():
msg="servers cannot be used without providing domain")
else:
- if not ipautil.file_exists(options.replica_file):
+ if not os.path.isfile(options.replica_file):
ansible_module.fail_json(
msg="Replica file %s does not exist" % options.replica_file)
--
GitLab