invirt.common: give clearer error message on missing config variable

svn path=/trunk/packages/invirt-base/; revision=1934

diff --git a/debian/changelog b/debian/changelog
index fcba5fd..4200a28 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ invirt-base (0.0.18) unstable; urgency=low
   * run_parts_list: fix unclear docstring
   * config-init.sh: degrade to non-bash gracefully, document better
   * invirt.config: fix an error on empty config files
   * run_parts_list: fix unclear docstring
   * config-init.sh: degrade to non-bash gracefully, document better
   * invirt.config: fix an error on empty config files

+  * invirt.common: give clearer error message on missing config variable

 
 

- -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 19:16:03 -0500
+ -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 19:18:51 -0500

 
 invirt-base (0.0.17) unstable; urgency=low
 
 
 invirt-base (0.0.17) unstable; urgency=low
 

diff --git a/python/invirt/common.py b/python/invirt/common.py
index 2cf860d..85f37d6 100644 (file)
--- a/python/invirt/common.py
+++ b/python/invirt/common.py
@@ -4,22 +4,41 @@ import unittest
 from fcntl import flock, LOCK_EX, LOCK_SH, LOCK_UN
 import contextlib as clib
 
 from fcntl import flock, LOCK_EX, LOCK_SH, LOCK_UN
 import contextlib as clib
 

+class InvirtConfigError(AttributeError):
+    pass
+

 class struct(object):
     'A simple namespace object.'
 class struct(object):
     'A simple namespace object.'

-    def __init__(self, d = {}, **kwargs):
-        'd is the dictionary to update my __dict__ with.'
+    def __init__(self, d = {}, __prefix = None, **kwargs):
+        'd is the dictionary or the items-iterable to update my __dict__ with.'

         self.__dict__.update(d)
         self.__dict__.update(kwargs)
         self.__dict__.update(d)
         self.__dict__.update(kwargs)

+        self.__prefix = __prefix
+    def __getattr__(self, key):
+        # XX ideally these would point a frame higher on the stack.
+        prefix = self.__prefix
+        if prefix is not None:
+            raise InvirtConfigError('missing configuration variable %s%s'
+                                    % (prefix, key))
+        else:
+            raise AttributeError("anonymous struct has no member '%s'"
+                                 % (key,))

 
 

-def dicts2struct(x):
+def dicts2struct(x, prefix = None):

     """
     Given a tree of lists/dicts, perform a deep traversal to transform all the
     dicts to structs.
     """
     """
     Given a tree of lists/dicts, perform a deep traversal to transform all the
     dicts to structs.
     """

+    if prefix is not None:
+        def newprefix(k): return prefix + str(k) + '.'
+    else:
+        def newprefix(k): return prefix

     if type(x) == dict:
     if type(x) == dict:

-        return struct((k, dicts2struct(v)) for k,v in x.iteritems())
+        return struct(((k, dicts2struct(v, newprefix(k)))
+                       for k,v in x.iteritems()),
+                      prefix)

     elif type(x) == list:
     elif type(x) == list:

-        return [dicts2struct(v) for v in x]
+        return [dicts2struct(v, newprefix(i)) for i, v in enumerate(x)]

     else:
         return x
 
     else:
         return x
 

@@ -67,7 +86,7 @@ class common_tests(unittest.TestCase):
                 'dict': { 'atom': 'atom', 'list': [1,2,3] },
                 'list': [ 'atom', {'key': 'value'} ]
                 }
                 'dict': { 'atom': 'atom', 'list': [1,2,3] },
                 'list': [ 'atom', {'key': 'value'} ]
                 }

-        structs = dicts2struct(dicts)
+        structs = dicts2struct(dicts, '')

         self.assertEqual(structs.atom,        dicts['atom'])
         self.assertEqual(structs.dict.atom,   dicts['dict']['atom'])
         self.assertEqual(structs.dict.list,   dicts['dict']['list'])
         self.assertEqual(structs.atom,        dicts['atom'])
         self.assertEqual(structs.dict.atom,   dicts['dict']['atom'])
         self.assertEqual(structs.dict.list,   dicts['dict']['list'])

diff --git a/python/invirt/config.py b/python/invirt/config.py
index 8c5e7e2..bcd2423 100644 (file)
--- a/python/invirt/config.py
+++ b/python/invirt/config.py
@@ -140,6 +140,6 @@ def load(force_refresh = False):
     return ns.cfg
 
 dicts = load()
     return ns.cfg
 
 dicts = load()

-structs = dicts2struct(dicts)
+structs = dicts2struct(dicts, '')

 
 # vim:et:sw=4:ts=4
 
 # vim:et:sw=4:ts=4