From 608e398386b88476facfa86632d95b6b1da0bf62 Mon Sep 17 00:00:00 2001 From: Will Dowling Date: Mon, 25 Mar 2013 10:45:43 +0000 Subject: [PATCH] Removing utils.file_exists and replacing with os.path.isfile --- pelican/__init__.py | 4 ++-- pelican/utils.py | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pelican/__init__.py b/pelican/__init__.py index a57ecb4c..3be8ceb8 100644 --- a/pelican/__init__.py +++ b/pelican/__init__.py @@ -17,7 +17,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator, from pelican.log import init from pelican.settings import read_settings from pelican.utils import (clean_output_dir, files_changed, file_changed, - file_exists, NoFilesError) + NoFilesError) from pelican.writers import Writer __major__ = 3 @@ -272,7 +272,7 @@ def get_config(args): def get_instance(args): config_file = args.settings - if config_file is None and file_exists(DEFAULT_CONFIG_NAME): + if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME): config_file = DEFAULT_CONFIG_NAME settings = read_settings(config_file, override=get_config(args)) diff --git a/pelican/utils.py b/pelican/utils.py index 36d2995c..3ae88402 100644 --- a/pelican/utils.py +++ b/pelican/utils.py @@ -268,14 +268,6 @@ def copy(path, source, destination, destination_path=None, overwrite=False): logger.warning('skipped copy %s to %s' % (source_, destination_)) -def file_exists(path): - """Checks path exists and is a file - - :param path: the path to be checked - """ - return os.path.exists(path) and os.path.isfile(path) - - def clean_output_dir(path): """Remove all the files from the output directory"""