fix yaml construct a slot object

lib/yaml/constructor.py

@@ -560,7 +560,7 @@ def set_python_instance_state(self, instance, state):
             elif state:
                 slotstate.update(state)
             for key, value in slotstate.items():
-                setattr(object, key, value)
+                setattr(instance, key, value)
 
     def construct_python_object(self, suffix, node):
         # Format:

lib3/yaml/constructor.py

@@ -567,7 +567,7 @@ def set_python_instance_state(self, instance, state):
             elif state:
                 slotstate.update(state)
             for key, value in slotstate.items():
-                setattr(object, key, value)
+                setattr(instance, key, value)
 
     def construct_python_object(self, suffix, node):
         # Format:

tests/data/construct-python-object.code

@@ -8,6 +8,8 @@ AnInstance(1, 'two', [3,3,3]),
 AState(1, 'two', [3,3,3]),
 ACustomState(1, 'two', [3,3,3]),
 
+AnInstanceWithSlots(1, 'two', [3,3,3]),
+
 InitArgs(1, 'two', [3,3,3]),
 InitArgsWithState(1, 'two', [3,3,3]),
 

tests/data/construct-python-object.data

@@ -7,6 +7,8 @@
 - !!python/object:test_constructor.AState { _foo: 1, _bar: two, _baz: [3,3,3] }
 - !!python/object/new:test_constructor.ACustomState { state: !!python/tuple [1, two, [3,3,3]] }
 
+- !!python/object/new:test_constructor.AnInstanceWithSlots {state: !!python/tuple [null, {bar: two, baz: [3, 3, 3], foo: 1}]}
+
 - !!python/object/new:test_constructor.InitArgs [1, two, [3,3,3]]
 - !!python/object/new:test_constructor.InitArgsWithState { args: [1, two], state: [3,3,3] }
 

tests/lib/test_constructor.py

@@ -15,7 +15,7 @@ def execute(code):
 
 def _make_objects():
     global MyLoader, MyDumper, MyTestClass1, MyTestClass2, MyTestClass3, YAMLObject1, YAMLObject2,  \
-            AnObject, AnInstance, AState, ACustomState, InitArgs, InitArgsWithState,    \
+            AnObject, AnInstance, AState, ACustomState, AnInstanceWithSlots, InitArgs, InitArgsWithState,    \
             NewArgs, NewArgsWithState, Reduce, ReduceWithState, MyInt, MyList, MyDict,  \
             FixedOffset, today, execute
 
@@ -147,6 +147,22 @@ def __getstate__(self):
         def __setstate__(self, state):
             self.foo, self.bar, self.baz = state
 
+    class AnInstanceWithSlots(object):
+        __slots__ = ('foo', 'bar', 'baz')
+
+        def __init__(self, foo=None, bar=None, baz=None):
+            self.foo = foo
+            self.bar = bar
+            self.baz = baz
+
+        def __cmp__(self, other):
+            return cmp((type(self), self.foo, self.bar, self.baz),
+                    (type(other), other.foo, other.bar, other.baz))
+
+        def __eq__(self, other):
+            return type(self) is type(other) and    \
+                    (self.foo, self.bar, self.baz) == (other.foo, other.bar, other.baz)
+
     class InitArgs(AnInstance):
         def __getinitargs__(self):
             return (self.foo, self.bar, self.baz)

tests/lib3/test_constructor.py

@@ -12,7 +12,7 @@ def execute(code):
 
 def _make_objects():
     global MyLoader, MyDumper, MyTestClass1, MyTestClass2, MyTestClass3, YAMLObject1, YAMLObject2,  \
-            AnObject, AnInstance, AState, ACustomState, InitArgs, InitArgsWithState,    \
+            AnObject, AnInstance, AState, ACustomState, AnInstanceWithSlots, InitArgs, InitArgsWithState,    \
             NewArgs, NewArgsWithState, Reduce, ReduceWithState, MyInt, MyList, MyDict,  \
             FixedOffset, today, execute
 
@@ -144,6 +144,22 @@ def __getstate__(self):
         def __setstate__(self, state):
             self.foo, self.bar, self.baz = state
 
+    class AnInstanceWithSlots(object):
+        __slots__ = ('foo', 'bar', 'baz')
+
+        def __init__(self, foo=None, bar=None, baz=None):
+            self.foo = foo
+            self.bar = bar
+            self.baz = baz
+
+        def __cmp__(self, other):
+            return cmp((type(self), self.foo, self.bar, self.baz),
+                    (type(other), other.foo, other.bar, other.baz))
+
+        def __eq__(self, other):
+            return type(self) is type(other) and    \
+                    (self.foo, self.bar, self.baz) == (other.foo, other.bar, other.baz)
+
     class NewArgs(AnObject):
         def __getnewargs__(self):
             return (self.foo, self.bar, self.baz)