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 <cheimes@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Christian Heimes
2017-10-20 11:10:20 +02:00
committed by Stanislav Laznicka
parent fad88b358b
commit b29db07c3b
26 changed files with 57 additions and 78 deletions

View File

@@ -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")