Merge branch 'serialisation'

Conflicts:
	CHANGES.SlapOS.txt
	setup.py

CHANGES.SlapOS.txt

+1.6.0-dev-SlapOS-008
+--------------------
+
+- Fix assigning non-string values to section keys:
+  Make Options.copy return de-serialised values.
+  Make _save_option accept non-string values.
+
 1.6.0-dev-SlapOS-007
 --------------------
 

setup.py

@@ -12,7 +12,7 @@
 #
 ##############################################################################
 name = "zc.buildout"
-version = "1.6.0-dev-SlapOS-007"
+version = "1.6.0-dev-SlapOS-008"
 
 import os
 from setuptools import setup

src/zc/buildout/buildout.py

@@ -1547,6 +1547,9 @@ class Options(UserDict.DictMixin):
         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)
         return result
 
     def _call(self, f):
@@ -1634,6 +1637,8 @@ def _quote_spacey_nl(match):
     return result
 
 def _save_option(option, value, f):
+    if not isinstance(value, str):
+        value = dumps(value)
     value = _spacey_nl.sub(_quote_spacey_nl, value)
     if value.startswith('\n\t'):
         value = '%(__buildout_space_n__)s' + value[2:]