Index: branches/pyyaml3000/tests/test_errors.py
===================================================================
--- branches/pyyaml3000/tests/test_errors.py	(revision 53)
+++ branches/pyyaml3000/tests/test_errors.py	(revision 58)
@@ -2,10 +2,5 @@
 import test_appliance
 
-from yaml.error import YAMLError
-from yaml.reader import *
-from yaml.scanner import *
-from yaml.parser import *
-from yaml.composer import *
-from yaml.resolver import *
+from yaml import *
 
 class TestErrors(test_appliance.TestAppliance):
@@ -26,5 +21,6 @@
             composer = Composer(parser)
             resolver = Resolver(composer)
-            return list(composer)
+            constructor = Constructor(resolver)
+            return list(constructor)
         except YAMLError, exc:
         #except ScannerError, exc:
@@ -42,12 +38,14 @@
             composer = Composer(parser)
             resolver = Resolver(composer)
-            return list(composer)
-        except YAMLError, exc:
+            constructor = Constructor(resolver)
+            return list(constructor)
+        #except YAMLError, exc:
         #except ScannerError, exc:
         #except ParserError, exc:
         #except ComposerError, exc:
-            #print '.'*70
-            #print "%s:" % filename
-            #print "%s:" % exc.__class__.__name__, exc
+        except ConstructorError, exc:
+            print '.'*70
+            print "%s:" % filename
+            print "%s:" % exc.__class__.__name__, exc
             raise