Merge pull request cosmosis-developers#214 from cosmosis-developers/py-update-config-interpolation

Fix config object items method when there are defaults and defaults=False

Author: joezuntz

cosmosis/runtime/config.py

@@ -206,6 +206,7 @@ def _interpolate_compatibility(self, section, option, value, d):
         elif hasattr(self, "_interpolate"):
             return self._interpolate(section, option, value, d)
         else:
+            d = self._unify_values(section, {})
             return self._interpolation.before_get(self, section, option, value, d)
 
 

cosmosis/test/test_parameters.py

@@ -4,6 +4,7 @@
 import numpy as np
 import tempfile
 import os
+import io
 
 def test_override_new():
     with tempfile.NamedTemporaryFile('w') as values:
@@ -97,4 +98,17 @@ def test_items():
     ini.set("parameters", "p1", "-3.0  0.0  3.0")
     ini.set("parameters", "p2", "-3.0  0.0  3.0")
     ini.items("parameters", defaults=True)
-    ini.items("parameters", defaults=False)
+    ini.items("parameters", defaults=False)
+
+def test_items_with_defaults():
+    sio = io.StringIO("""
+[DEFAULT]
+x = 1
+[parameters]
+y = 2
+""")
+    ini = Inifile(sio)
+    assert ini.getint("parameters", "y") == 2
+    assert ini.getint("parameters", "x") == 1
+    assert dict(ini.items("parameters", defaults=True)) == {"x": "1", "y": "2"}
+    assert dict(ini.items("parameters", defaults=False)) == {"y": "2"}