Merge branch 'master' into better_warnings

test/test_config_api.py

@@ -115,6 +115,18 @@ def test_make_dict():
     raises(ValueError, 'd2 = config.make_dict(withvalue="3")')
 
 
+def test_make_dict_with_disabled():
+    descr = OptionDescription("opt", "", [
+        OptionDescription("s1", "", [
+            BoolOption("a", "", default=False),
+            BoolOption("b", "", default=False, properties=('disabled',))]),
+        IntOption("int", "", default=42)])
+    config = Config(descr)
+    config.read_only()
+    d = config.make_dict()
+    assert d == {"s1.a": False, "int": 42}
+
+
 def test_find_in_config():
     "finds option in config"
     descr = make_description()

test/test_option_consistency.py

@@ -359,3 +359,17 @@ def test_consistency_permissive():
     c.cfgimpl_get_settings().setpermissive(('hidden',))
     c.read_write()
     c.a = 1
+
+
+def return_val(*args, **kwargs):
+    return '192.168.1.1'
+
+
+def test_consistency_with_callback():
+    a = NetworkOption('a', '', default='192.168.1.0')
+    b = NetmaskOption('b', '', default='255.255.255.0')
+    c = IPOption('c', '', callback=return_val, callback_params={'': ((a, False),)})
+    od = OptionDescription('od', '', [a, b, c])
+    c.impl_add_consistency('in_network', a, b)
+    cfg = Config(od)
+    cfg.c

tiramisu/config.py

@@ -448,17 +448,20 @@ class SubConfig(object):
         return pathsvalues
 
     def _make_sub_dict(self, opt, path, pathsvalues, _currpath, flatten):
-        if isinstance(opt, OptionDescription):
-            pathsvalues += getattr(self, path).make_dict(flatten,
-                                                         _currpath +
-                                                         path.split('.'))
-        else:
-            value = self._getattr(opt._name)
-            if flatten:
-                name = opt._name
+        try:
+            if isinstance(opt, OptionDescription):
+                pathsvalues += getattr(self, path).make_dict(flatten,
+                                                             _currpath +
+                                                             path.split('.'))
             else:
-                name = '.'.join(_currpath + [opt._name])
-            pathsvalues.append((name, value))
+                value = self._getattr(opt._name)
+                if flatten:
+                    name = opt._name
+                else:
+                    name = '.'.join(_currpath + [opt._name])
+                pathsvalues.append((name, value))
+        except PropertiesOptionError:
+            pass
 
     def cfgimpl_get_path(self):
         descr = self.cfgimpl_get_description()