From d6f79c4a567a406c2f2e68b1f41dce0adbf1c023 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 10 Feb 2004 03:15:31 +0000 Subject: [PATCH] Made a showDefault configuration option for deciding whether or not to write the default to the registry, and made registerPlugin set it to False (who needs to know what the default is for that stuff?) --- src/conf.py | 2 +- src/registry.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/conf.py b/src/conf.py index af3681a14..95ff35009 100644 --- a/src/conf.py +++ b/src/conf.py @@ -59,7 +59,7 @@ supybot.setName('supybot') def registerPlugin(name, currentValue=None): supybot.plugins.register(name, registry.Boolean(False, """Determines - whether this plugin is loaded by default.""")) + whether this plugin is loaded by default.""", showDefault=False)) if currentValue is not None: supybot.plugins.get(name).setValue(currentValue) diff --git a/src/registry.py b/src/registry.py index 2344a611a..6de074cb8 100644 --- a/src/registry.py +++ b/src/registry.py @@ -87,12 +87,13 @@ def close(registry, filename, annotated=True, helpOnceOnly=False): lines.insert(0, '\n') if hasattr(value, 'value'): lines.append('#\n') - try: - original = value.value - value.value = value.default - lines.append('# Default value: %s\n' % value) - finally: - value.value = original + if value.showDefault: + try: + original = value.value + value.value = value.default + lines.append('# Default value: %s\n' % value) + finally: + value.value = original lines.append('###\n') fd.writelines(lines) if hasattr(value, 'value'): # This lets us print help for non-valued. @@ -190,9 +191,10 @@ class Group(object): class Value(Group): - def __init__(self, default, help, **kwargs): + def __init__(self, default, help, showDefault=True, **kwargs): Group.__init__(self, **kwargs) self.default = default + self.showDefault = showDefault self.help = utils.normalizeWhitespace(help.strip()) self.setValue(default)