Index: pyyaml/trunk/tests3/test_constructor.py
===================================================================
--- pyyaml/trunk/tests3/test_constructor.py	(revision 328)
+++ pyyaml/trunk/tests3/test_constructor.py	(revision 329)
@@ -7,4 +7,5 @@
 
 def execute(code):
+    global value
     exec(code)
     return value
@@ -12,7 +13,6 @@
 def _make_objects():
     global MyLoader, MyDumper, MyTestClass1, MyTestClass2, MyTestClass3, YAMLObject1, YAMLObject2,  \
-            AnObject, AnInstance, AState, ACustomState, InitArgs, InitArgsWithState,    \
-            NewArgs, NewArgsWithState, Reduce, ReduceWithState, MyInt, MyList, MyDict,  \
-            FixedOffset, execute
+            AnObject, AnInstance, AState, ACustomState, NewArgs, NewArgsWithState,  \
+            Reduce, ReduceWithState, MyInt, MyList, MyDict, FixedOffset, execute
 
     class MyLoader(yaml.Loader):
@@ -100,5 +100,5 @@
                 return False
 
-    class AnObject(object):
+    class AnObject:
         def __new__(cls, foo=None, bar=None, baz=None):
             self = object.__new__(cls)
@@ -143,18 +143,4 @@
         def __setstate__(self, state):
             self.foo, self.bar, self.baz = state
-
-    class InitArgs(AnInstance):
-        def __getinitargs__(self):
-            return (self.foo, self.bar, self.baz)
-        def __getstate__(self):
-            return {}
-
-    class InitArgsWithState(AnInstance):
-        def __getinitargs__(self):
-            return (self.foo, self.bar)
-        def __getstate__(self):
-            return self.baz
-        def __setstate__(self, state):
-            self.baz = state
 
     class NewArgs(AnObject):