class struct(dict):
'A simple namespace object.'
- def __init__(self, d = {}, __prefix = None, **kwargs):
+ def __init__(self, d = {}, __prefix = None, __default=None, **kwargs):
super(struct, self).__init__(d)
self.__prefix = __prefix
+ self.__default = __default
self.update(kwargs)
def __getattr__(self, 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))
+ if self.__default is None:
+ # 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,))
else:
- raise AttributeError("anonymous struct has no member '%s'"
- % (key,))
+ return struct({}, '', self.__default)
-def dicts2struct(x, prefix = None):
+def dicts2struct(x, prefix = None, default = None):
"""
Given a tree of lists/dicts, perform a deep traversal to transform all the
dicts to structs.
else:
def newprefix(k): return prefix
if type(x) == dict:
- return struct(((k, dicts2struct(v, newprefix(k)))
+ return struct(((k, dicts2struct(v, newprefix(k), default))
for k,v in x.iteritems()),
- prefix)
+ prefix,
+ default)
elif type(x) == list:
- return [dicts2struct(v, newprefix(i)) for i, v in enumerate(x)]
+ return [dicts2struct(v, newprefix(i), default)
+ for i, v in enumerate(x)]
elif x is None:
- return struct({}, prefix)
+ return struct({}, prefix, default)
else:
return x
if 'stdout' not in kwargs:
kwargs['stdout'] = subprocess.PIPE
if 'stderr' not in kwargs:
- kwargs['stderr'] = subprocess.STDOUT
+ kwargs['stderr'] = subprocess.PIPE
p = subprocess.Popen(popen_args, *args, **kwargs)
- out, _ = p.communicate(stdin_str)
+ out, err = p.communicate(stdin_str)
if p.returncode:
- raise subprocess.CalledProcessError(p.returncode, popen_args, out)
+ raise subprocess.CalledProcessError(p.returncode, '%s, stdout: %s, stderr: %s' %
+ (popen_args, out, err))
return out
#