From 4a064c78f4d5b511408697ac741109a986b11db0 Mon Sep 17 00:00:00 2001 From: Tom Marsh Date: Wed, 17 Mar 2021 14:29:07 +0000 Subject: [PATCH] cline -- handle case of trying to retrieve a non-existent default --- hipercam/cline.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hipercam/cline.py b/hipercam/cline.py index 6f32998..190ceaa 100644 --- a/hipercam/cline.py +++ b/hipercam/cline.py @@ -469,7 +469,8 @@ def set_default(self, param, defval): def get_default(self, param): """ - Gets the current default value of a parameter called 'param' + Gets the current default value of a parameter called 'param'. Can come back None + if there is no value set. """ if param not in self._rpars: raise ClineError( @@ -477,9 +478,9 @@ def get_default(self, param): ) if self._rpars[param]["g_or_l"] == Cline.GLOBAL: - defval = self._gpars[param] + defval = self._gpars.get(param,None) else: - defval = self._lpars[param] + defval = self._lpars.get(param,None) return defval def get_value(