Merge branch 'serialisation'

src/zc/buildout/buildout.py

@@ -71,6 +71,8 @@ class BuildoutSerialiser(object):
         'list': list,
         'str': str,
         'tuple': tuple,
+        'False': False,
+        'True': True,
     }}
 
     def loads(self, value):
@@ -1599,6 +1601,20 @@ class Options(UserDict.DictMixin):
         """
         return _convert_bool(name, self[name])
 
+    def __eq__(self, other):
+        """Because __cmp__ calls cmp(self, other)
+        and if self contains set instance, it fails.
+        """
+        if isinstance(other, (UserDict.DictMixin, dict)):
+            for item_self, item_other in itertools.izip_longest(
+                                                            self.iteritems(),
+                                                            other.iteritems()):
+                if item_self != item_other:
+                    return False
+            return True
+        else:
+            return super(Options, self).__eq__(other)
+
 
 def _convert_bool(name, value):
     if value not in ('true', 'false'):