From 4230a2143580d05a370287fb0c7a525b6f90f1bd Mon Sep 17 00:00:00 2001 From: John Stumpo Date: Sun, 6 Jan 2013 02:12:34 -0500 Subject: [PATCH] Config: remove log_ini_reads --- src/Config.py | 24 +++++------------------- src/ConfigDefs.py | 1 - src/Settings.py | 1 - 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/Config.py b/src/Config.py index 4cf2bf763..df3325749 100644 --- a/src/Config.py +++ b/src/Config.py @@ -32,7 +32,6 @@ config = None prototype = {} -logIniReads = 0 #MFH - INI reads disabled by default during the startup period logUndefinedGets = 0 class MyConfigParser(RawConfigParser): @@ -99,11 +98,10 @@ def define(section, option, type, default = None, text = None, options = None, p def load(fileName = None, setAsDefault = False, type = 0): """Load a configuration with the default prototype""" - global config, logIniReads, logUndefinedGets + global config, logUndefinedGets c = Config(prototype, fileName, type) if setAsDefault and not config: config = c - logIniReads = c.get("game", "log_ini_reads") logUndefinedGets = c.get("game", "log_undefined_gets") return c @@ -170,7 +168,7 @@ def get(self, section, option): @return: Key value """ - global logIniReads, logUndefinedGets + global logUndefinedGets try: type = self.prototype[section][option].type @@ -182,9 +180,6 @@ def get(self, section, option): value = _convertValue(self.config.get(section, option) if self.config.has_option(section, option) else default, type, default) - #myfingershurt: verbose log output - if logIniReads == 1: - Log.debug("Config.get: %s.%s = %s" % (section, option, value)) return value def getOptions(self, section, option): @@ -195,7 +190,7 @@ def getOptions(self, section, option): @param option: Option name @return: Tuple of Key list and Values list """ - global logIniReads, logUndefinedGets + global logUndefinedGets try: @@ -214,9 +209,6 @@ def getOptions(self, section, option): value = _convertValue(keys[i], type) optionList.append(value) - #myfingershurt: verbose log output - if logIniReads == 1: - Log.debug("Config.getOptions: %s.%s = %s" % (section, option, str(optionList))) return optionList, options def getTipText(self, section, option): @@ -228,7 +220,7 @@ def getTipText(self, section, option): @return: Tip Text String """ - global logIniReads, logUndefinedGets + global logUndefinedGets try: text = self.prototype[section][option].tipText @@ -237,9 +229,6 @@ def getTipText(self, section, option): Log.warn("Config key %s.%s not defined while reading %s." % (section, option, self.fileName)) text = None - #myfingershurt: verbose log output - if logIniReads == 1: - Log.debug("Config.getTipText: %s.%s = %s" % (section, option, text)) return text def getDefault(self, section, option): @@ -250,7 +239,7 @@ def getDefault(self, section, option): @param option: Option name @return: Key value """ - global logIniReads, logUndefinedGets + global logUndefinedGets try: @@ -263,9 +252,6 @@ def getDefault(self, section, option): value = _convertValue(default, type) - #myfingershurt: verbose log output - if logIniReads == 1: - Log.debug("Config.getDefault: %s.%s = %s" % (section, option, value)) return value def set(self, section, option, value): diff --git a/src/ConfigDefs.py b/src/ConfigDefs.py index a4e1a9a28..c854d19cb 100644 --- a/src/ConfigDefs.py +++ b/src/ConfigDefs.py @@ -210,7 +210,6 @@ def sortOptionsByKey(dict): #MFH - log settings -Config.define("game", "log_ini_reads", int, 0, text = _("Log INI Reads"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs any read to an INI file. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant.")) Config.define("game", "log_class_inits", int, 0, text = _("Log Class Inits"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs most class initializations in '__init__'. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant.")) Config.define("game", "log_loadings", int, 0, text = _("Log Loadings"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs resource loads. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant.")) Config.define("game", "log_sections", int, 0, text = _("Log MIDI Sections"), options = {0: _("No"), 1: _("Yes")}, tipText = _("Logs MIDI sections. This is unnecessary information in bug reports; please leave it disabled unless you are certain it is relevant.")) diff --git a/src/Settings.py b/src/Settings.py index 3a7ce7fbd..1cb8f43c7 100644 --- a/src/Settings.py +++ b/src/Settings.py @@ -900,7 +900,6 @@ def __init__(self, engine): #MFH - new menu self.logfileSettings = [ - ConfigChoice(engine, engine.config, "game", "log_ini_reads", autoApply = True),#myfingershurt ConfigChoice(engine, engine.config, "game", "log_class_inits", autoApply = True),#myfingershurt ConfigChoice(engine, engine.config, "game", "log_loadings", autoApply = True),#myfingershurt ConfigChoice(engine, engine.config, "game", "log_sections", autoApply = True),#myfingershurt