unserialize values _after_ loading _data (so they are not overwritten)

dc35342a · Marco Mariani · Cédric de Saint Martin · cda6fca6 · dc35342a
Commit dc35342a authored Sep 28, 2012 by Marco Mariani Committed by Cédric de Saint Martin Sep 28, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/zc/buildout/buildout.py src/zc/buildout/buildout.py +2 -2

No files found.
--- a/src/zc/buildout/buildout.py
+++ b/src/zc/buildout/buildout.py
@@ -1371,11 +1371,11 @@ class Options(UserDict.DictMixin):

    def copy(self):
        result = self._raw.copy()
+        result.update(self._cooked)
+        result.update(self._data)
        for key, value in result.iteritems():
            if value.startswith(SERIALISED_VALUE_MAGIC):
                result[key] = loads(value)
-        result.update(self._cooked)
-        result.update(self._data)
        return result

    def _call(self, f):