Commit c7540f96 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'serialisation'

Conflicts:
	setup.py
parents 8ff9901e dc35342a
...@@ -1550,6 +1550,9 @@ class Options(UserDict.DictMixin): ...@@ -1550,6 +1550,9 @@ class Options(UserDict.DictMixin):
result[key] = loads(value) result[key] = loads(value)
result.update(self._cooked) result.update(self._cooked)
result.update(self._data) result.update(self._data)
for key, value in result.iteritems():
if value.startswith(SERIALISED_VALUE_MAGIC):
result[key] = loads(value)
return result return result
def _call(self, f): def _call(self, f):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment