class InvirtConfigError(AttributeError):
pass
-class struct(object):
+class struct(dict):
'A simple namespace object.'
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)
+ super(struct, self).__init__(d)
self.__prefix = __prefix
+ self.update(kwargs)
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,))
+ try:
+ return self[key]
+ except KeyError:
+ # 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, prefix = None):
"""
self.assertEqual(structs.dict.list, dicts['dict']['list'])
self.assertEqual(structs.list[0], dicts['list'][0])
self.assertEqual(structs.list[1].key, dicts['list'][1]['key'])
+ self.assertEqual(set(structs), set(['atom', 'dict', 'list']))
if __name__ == '__main__':
unittest.main()