Index: pyyaml/trunk/examples/yaml-hl/yaml_hl.py
===================================================================
--- pyyaml/trunk/examples/yaml-hl/yaml_hl.py	(revision 136)
+++ pyyaml/trunk/examples/yaml-hl/yaml_hl.py	(revision 145)
@@ -3,16 +3,14 @@
 import yaml, codecs, sys, optparse
 
-
-
-yaml.add_resolver(u'!Config', [])
-yaml.add_resolver(u'!TokensConfig', [u'tokens'])
-yaml.add_resolver(u'!EventsConfig', [u'events'])
-yaml.add_resolver(u'!StartEndConfig', [u'tokens', None])
-yaml.add_resolver(u'!StartEndConfig', [u'events', None])
+#yaml.add_resolver(u'!Config', [])
+#yaml.add_resolver(u'!TokensConfig', [u'tokens'])
+#yaml.add_resolver(u'!EventsConfig', [u'events'])
+#yaml.add_resolver(u'!StartEndConfig', [u'tokens', None])
+#yaml.add_resolver(u'!StartEndConfig', [u'events', None])
 
 class YAMLHighlight:
 
     def __init__(self, config):
-        parameters = yaml.load_document(config)
+        parameters = yaml.load(config)
         self.replaces = parameters['replaces']
         self.substitutions = {}
@@ -37,5 +35,5 @@
             else:
                 input = unicode(input, 'utf-8')
-        tokens = yaml.parse(input, Parser=iter)
+        tokens = yaml.scan(input)
         events = yaml.parse(input)
         markers = []