fixup! Add support for a few built-in python object types as values.

Make Options.copy return de-serialised values.
Make _save_option accept non-string values.

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
+--------------------
+
+- Add support of networkcache for pypi index, extensions and recipes using
+  buildout internals.
+    https://bugs.launchpad.net/zc.buildout/+bug/1041249
+
+1.6.0-dev-SlapOS-006
+--------------------
+
+- Allow assigning non-string values to section keys. Restricted to selected
+  python base types.
+
+1.6.0-dev-SlapOS-005
+--------------------
+
+- Networkcache prints less frightening messages.
+- Allow extending more than once sections extending other sections.
+
+1.6.0-dev-SlapOS-004
+--------------------
+
+- Make buildout.rmtree working with symlink as a path argument.
+    https://bugs.launchpad.net/zc.buildout/+bug/144228
+
+1.6.0-dev-SlapOS-003
+--------------------
+
+- Increase immunity of buildout against networkcache issues.
+- Fix analysis of passed SSL certificates for networkcache.
+
+1.6.0-dev-SlapOS-002
+--------------------
+
+- Fix of 1.6.0-dev-SlapOS-001's $$ escaping.
+
+1.6.0-dev-SlapOS-001
+--------------------
+
+- Fix $$ escaping.
+
+1.5.3-dev-SlapOS-010
+--------------------
+
+- Make networkcache immune to slapos.libnetworkcache errors.
+
+1.5.3-dev-SlapOS-009
+--------------------
+
+- Implement networkcache SSL authentication.
+
+1.5.3-dev-SlapOS-008
+--------------------
+
+- Fix 1.5.3-dev-SlapOS-007: workaround was not working.
+
+1.5.3-dev-SlapOS-007
+--------------------
+
+- Workaround M2Crypto https redirect download bug:
+   https://bugzilla.osafoundation.org/show_bug.cgi?id=13033
+
+1.5.3-dev-SlapOS-006
+--------------------
+
+- Implemented networkcache signature creation and checking.
+- Fixed slapos.libnetworkcache installation during bootstrap.
+
+1.5.3-dev-SlapOS-005
+--------------------
+
+- Followed API changes in slapos.libnetworkcache.
+
+1.5.3-dev-SlapOS-004
+--------------------
+
+- Re added support for _profile_base_location_ mistakenely removed in
+  1.5.3-dev-SlapOS-003.
+
+1.5.3-dev-SlapOS-003
+--------------------
+
+- Support networkcache by slapos.libnetworkcache library.
+
+- Make extends less hungry for network, by making URLs canonical.
+
+Bugs fixed:
+
+- Fix exception hiding in checksum error redownloading.
+
+1.5.3-dev-SlapOS-001
+--------------------
+
+- Make ${:_profile_location_} and ${:_profile_base_location_} parameters
+  available in parts to access current profile location (url, path)
+  or base location (base of url or path).
+
+- Add --buildout-download-base to bootstrap.py parameters in order to being
+  able to choose fully custom zc.buildout distribution location.
+
+- Redownload once files with wrong checksum in download cache.

setup.py

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

src/zc/buildout/buildout.py

@@ -1371,6 +1371,9 @@ class Options(UserDict.DictMixin):
 
     def copy(self):
         result = self._raw.copy()
+        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
@@ -1460,6 +1463,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:]