From b29db07c3b3d8937f53684fdbba985fec525d69d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 20 Oct 2017 11:10:20 +0200 Subject: Use os.path.isfile() and isdir() 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 Signed-off-by: Christian Heimes Reviewed-By: Stanislav Laznicka --- ipapython/ipautil.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'ipapython') diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index c5c5e9e21..71ed4a174 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -29,7 +29,6 @@ import math import os import sys import copy -import stat import shutil import socket import re @@ -543,31 +542,16 @@ def nolog_replace(string, nolog): return string -def file_exists(filename): - try: - mode = os.stat(filename)[stat.ST_MODE] - return bool(stat.S_ISREG(mode)) - except Exception: - return False - -def dir_exists(filename): - try: - mode = os.stat(filename)[stat.ST_MODE] - return bool(stat.S_ISDIR(mode)) - except Exception: - return False - - def install_file(fname, dest): # SELinux: use copy to keep the right context - if file_exists(dest): + if os.path.isfile(dest): os.rename(dest, dest + ".orig") shutil.copy(fname, dest) os.remove(fname) def backup_file(fname): - if file_exists(fname): + if os.path.isfile(fname): os.rename(fname, fname + ".orig") -- cgit