From 7617b3f9fe7ab2d29f23babfa7bfbd1347253453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Mon, 3 Nov 2008 00:01:46 +0100 Subject: Add defaults only session loading --- portato/session.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'portato/session.py') diff --git a/portato/session.py b/portato/session.py index 4b0edb0..4f904ed 100644 --- a/portato/session.py +++ b/portato/session.py @@ -63,21 +63,28 @@ class Session (object): """ self._handlers.append((options, load_fn, save_fn, default)) - def load (self): + def load (self, defaults_only = False): """ Loads and applies all values of the session. """ + + def ldefault (options, lfn, default): + if not default: return + debug("Loading %s with defaults %s.", options, default) + lfn(*default) + for options, lfn, sfn, default in self._handlers: - try: - loaded = [self._cfg.get(*x) for x in options] - except KeyError: # does not exist -> ignore - debug("No values for %s.", options) - if default: - debug("Loading %s with defaults %s.", options, default) - lfn(*default) + if defaults_only: + ldefault(options, lfn, default) else: - debug("Loading %s with values %s.", options, loaded) - lfn(*loaded) + try: + loaded = [self._cfg.get(*x) for x in options] + except KeyError: # does not exist -> ignore + debug("No values for %s.", options) + ldefault(options, lfn, default) + else: + debug("Loading %s with values %s.", options, loaded) + lfn(*loaded) def save (self): """ -- cgit v1.2.3