# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1464320658 25200
# Node ID d446029c9478c0eeff90e12d4943ae118fdc07e7
# Parent  aed8a860c1d007adf729bdd5dfaf9e9ae27e872d
data: Support both objects and dictionaries in `MergedMapping`.

diff -r aed8a860c1d0 -r d446029c9478 piecrust/data/base.py
--- a/piecrust/data/base.py	Thu May 26 20:43:51 2016 -0700
+++ b/piecrust/data/base.py	Thu May 26 20:44:18 2016 -0700
@@ -19,10 +19,18 @@
         values = []
         for d in self._dicts:
             try:
+                val = getattr(d, name)
+                values.append(val)
+                continue
+            except AttributeError:
+                pass
+
+            try:
                 val = d[name]
+                values.append(val)
+                continue
             except KeyError:
-                continue
-            values.append(val)
+                pass
 
         if len(values) == 0:
             raise KeyError("No such item: %s" % self._subp(name))