Fix yaml-hl to use the new API.

git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@145 18f92427-320e-0410-9341-c67f048884a3

1 files changed, 7 insertions, 9 deletions

diff --git a/examples/yaml-hl/yaml_hl.py b/examples/yaml-hl/yaml_hl.py
index 0801521..9477d37 100755
--- a/examples/yaml-hl/yaml_hl.py
+++ b/examples/yaml-hl/yaml_hl.py
@@ -2,18 +2,16 @@
 
 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 = {}
         for domain, items in [('Token', parameters['tokens']),
@@ -36,7 +34,7 @@ class YAMLHighlight:
                 input = unicode(input, 'utf-16-be')
             else:
                 input = unicode(input, 'utf-8')
-        tokens = yaml.parse(input, Parser=iter)
+        tokens = yaml.scan(input)
         events = yaml.parse(input)
         markers = []
         number = 0