Index: /branches/pyyaml3000/tests/test_structure.py
===================================================================
--- /branches/pyyaml3000/tests/test_structure.py	(revision 55)
+++ /branches/pyyaml3000/tests/test_structure.py	(revision 57)
@@ -2,11 +2,5 @@
 import test_appliance
 
-from yaml.reader import Reader
-from yaml.scanner import Scanner
-from yaml.parser import *
-from yaml.composer import *
-from yaml.resolver import *
-from yaml.constructor import *
-from yaml.nodes import *
+from yaml import *
 
 class TestStructure(test_appliance.TestAppliance):
@@ -161,4 +155,6 @@
         return pairs
 
+MyConstructor.add_constructor(None, MyConstructor.construct_scalar)
+
 class TestConstructor(test_appliance.TestAppliance):
 
Index: /branches/pyyaml3000/tests/data/spec-08-09.data
===================================================================
--- /branches/pyyaml3000/tests/data/spec-08-09.data	(revision 38)
+++ /branches/pyyaml3000/tests/data/spec-08-09.data	(revision 57)
@@ -6,5 +6,5 @@
     double: "some text"
 collections:
-  sequence: !!seq [ !str entry,
+  sequence: !!seq [ !!str entry,
     # Mapping entry:
       key: value ]
Index: /branches/pyyaml3000/lib/yaml/__init__.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/__init__.py	(revision 55)
+++ /branches/pyyaml3000/lib/yaml/__init__.py	(revision 57)
@@ -1,10 +1,10 @@
 
-from error import YAMLError
-from reader import Reader
-from scanner import Scanner
-from parser import Parser
-from composer import Composer
-from resolver import Resolver
-from constructor import Constructor
+from error import *
+from reader import *
+from scanner import *
+from parser import *
+from composer import *
+from resolver import *
+from constructor import *
 
 from tokens import *
Index: /branches/pyyaml3000/lib/yaml/resolver.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/resolver.py	(revision 56)
+++ /branches/pyyaml3000/lib/yaml/resolver.py	(revision 57)
@@ -1,6 +1,13 @@
 
+__all__ = ['BaseResolver', 'Resolver', 'ResolverError']
+
+from error import MarkedYAMLError
 from nodes import *
 
 import re
+
+# Not really used.
+class ResolverError(MarkedYAMLError):
+    pass
 
 class BaseResolver:
Index: /branches/pyyaml3000/lib/yaml/constructor.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/constructor.py	(revision 56)
+++ /branches/pyyaml3000/lib/yaml/constructor.py	(revision 57)
@@ -1,2 +1,5 @@
+
+__all__ = ['BaseConstructor', 'Constructor', 'ConstructorError',
+    'YAMLObject', 'YAMLObjectMetaclass']
 
 from error import *
@@ -325,4 +328,9 @@
         return self.construct_mapping(node)
 
+    def construct_undefined(self, node):
+        raise ConstructorError(None, None,
+                "could not determine a constructor for the tag %r" % node.tag.encode('utf-8'),
+                node.start_marker)
+
 Constructor.add_constructor(
         u'tag:yaml.org,2002:null',
@@ -368,4 +376,7 @@
         u'tag:yaml.org,2002:map',
         Constructor.construct_yaml_map)
+
+Constructor.add_constructor(None,
+        Constructor.construct_undefined)
 
 class YAMLObjectMetaclass(type):
Index: /branches/pyyaml3000/lib/yaml/composer.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/composer.py	(revision 55)
+++ /branches/pyyaml3000/lib/yaml/composer.py	(revision 57)
@@ -1,2 +1,4 @@
+
+__all__ = ['Composer', 'ComposerError']
 
 from error import MarkedYAMLError
Index: /branches/pyyaml3000/lib/yaml/scanner.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/scanner.py	(revision 55)
+++ /branches/pyyaml3000/lib/yaml/scanner.py	(revision 57)
@@ -20,4 +20,7 @@
 # TAG(value)
 # SCALAR(value, plain)
+#
+# Read comments in the Scanner code for more details.
+#
 
 __all__ = ['Scanner', 'ScannerError']
Index: /branches/pyyaml3000/lib/yaml/parser.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/parser.py	(revision 55)
+++ /branches/pyyaml3000/lib/yaml/parser.py	(revision 57)
@@ -61,4 +61,6 @@
 # flow_sequence_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
 # flow_mapping_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
+
+__all__ = ['Parser', 'ParserError']
 
 from error import MarkedYAMLError