Improvements to captureOutput

[invirt/packages/invirt-base.git] / python / invirt / common.py

diff --git a/python/invirt/common.py b/python/invirt/common.py
index f228a33..57fea45 100644 (file)
--- a/python/invirt/common.py
+++ b/python/invirt/common.py
@@ -8,24 +8,30 @@ import subprocess
 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)
+    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):
-        # 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:
+            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:
+                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.
@@ -35,13 +41,15 @@ def dicts2struct(x, prefix = None):
     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
 
@@ -74,11 +82,12 @@ def captureOutput(popen_args, stdin_str=None, *args, **kwargs):
     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
 
 #
@@ -118,6 +127,7 @@ class common_tests(unittest.TestCase):
         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()