Ticket #101: pyyaml-slots.diff

lib/yaml/representer.py

@@ -244 +244 @@
     def represent_yaml_object(self, tag, data, cls, flow_style=None):
         if hasattr(data, '__getstate__'):
             state = data.__getstate__()
+        elif getattr(data, '__slots__', None) and not hasattr(data, '__dict__'):
+            state = dict([(a, getattr(data, a)) for a in data.__slots__])
         else:
             state = data.__dict__.copy()
         return self.represent_mapping(tag, state, flow_style=flow_style)

lib/yaml/constructor.py

@@ -412 +412 @@
             data.__setstate__(state)
         else:
             state = self.construct_mapping(node)
-            data.__dict__.update(state)
+            try: data.__dict__.update(state)
+            except AttributeError:
+                for key, value in state.iteritems():
+                    setattr(data, key, value)
 
     def construct_undefined(self, node):
         raise ConstructorError(None, None,