From 60f90850cbd6ffaf3d75b328eb70a41622316713 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 27 Jul 2015 08:31:54 -0500 Subject: [PATCH] Don't need to check file existance ourselves for configparser. --- fanficfare/cli.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/fanficfare/cli.py b/fanficfare/cli.py index 2291d12..74f5750 100644 --- a/fanficfare/cli.py +++ b/fanficfare/cli.py @@ -16,7 +16,7 @@ # from optparse import OptionParser -from os.path import expanduser, isfile, join, dirname +from os.path import expanduser, join, dirname from os import access, R_OK from subprocess import call import ConfigParser @@ -214,25 +214,18 @@ def do_download(arg, if passed_defaultsini: configuration.readfp(passed_defaultsini) - if isfile(join(dirname(__file__), 'defaults.ini')): - conflist.append(join(dirname(__file__), 'defaults.ini')) - - if isfile(join(homepath, 'defaults.ini')): - conflist.append(join(homepath, 'defaults.ini')) - if isfile(join(homepath2, 'defaults.ini')): - conflist.append(join(homepath2, 'defaults.ini')) - if isfile('defaults.ini'): - conflist.append('defaults.ini') + # don't need to check existance for our selves. + conflist.append(join(dirname(__file__), 'defaults.ini')) + conflist.append(join(homepath, 'defaults.ini')) + conflist.append(join(homepath2, 'defaults.ini')) + conflist.append('defaults.ini') if passed_personalini: configuration.readfp(passed_personalini) - if isfile(join(homepath, 'personal.ini')): - conflist.append(join(homepath, 'personal.ini')) - if isfile(join(homepath2, 'personal.ini')): - conflist.append(join(homepath2, 'personal.ini')) - if isfile('personal.ini'): - conflist.append('personal.ini') + conflist.append(join(homepath, 'personal.ini')) + conflist.append(join(homepath2, 'personal.ini')) + conflist.append('personal.ini') if options.configfile: conflist.extend(options.configfile)