From 6a93cbac642c9ecba07b39852e133541981eb914 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Wed, 25 Feb 2015 18:18:40 +0100 Subject: [PATCH] Configtool: don't overwrite configtool.default.ini. It's rarely a good idea to overwrite files coming with a distribution. Not for users, because they can't reset to factory values; not for developers, because Git would pick up such changed files. Instead we read from configtool.default.ini now, but write to configtool.ini. If configtool.ini is already present, it's prefered over configtool.default.ini. --- configtool/settings.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configtool/settings.py b/configtool/settings.py index dee057e..b6c963d 100644 --- a/configtool/settings.py +++ b/configtool/settings.py @@ -4,7 +4,8 @@ import os import wx from configtool.data import BSIZESMALL, offsetTcLabel -INIFILE = "configtool.default.ini" +INIFILE = "configtool.ini" +DEFAULT_INIFILE = "configtool.default.ini" class Settings: @@ -24,9 +25,10 @@ class Settings: self.cfg = ConfigParser.ConfigParser() self.cfg.optionxform = str if not self.cfg.read(self.inifile): - print "Settings file %s does not exist. Using default values." % INIFILE - - return + if not self.cfg.read(os.path.join(folder, DEFAULT_INIFILE)): + print ("Neither of settings files %s or %s exist. Using default values." + % (INIFILE, DEFAULT_INIFILE)) + return if self.cfg.has_section(self.section): for opt, value in self.cfg.items(self.section):