Changeset 52 for branches/pyyaml3000/tests/test_errors.py

Timestamp:

02/20/06 12:41:45 (7 years ago)

Author:

xi

Message:

Cleanup error messages.

File:

• branches/pyyaml3000/tests/test_errors.py (modified) (2 diffs)

branches/pyyaml3000/tests/test_errors.py

@@ -3 +3 @@
 
 from yaml.error import YAMLError
-from yaml.reader import Reader
-from yaml.scanner import Scanner
+from yaml.reader import *
+from yaml.scanner import *
+from yaml.parser import *
 
 class TestErrors(test_appliance.TestAppliance):
@@ -17 +18 @@
 
     def _load(self, filename):
-        reader = Reader(file(filename, 'rb'))
-        scanner = Scanner(reader)
-        return list(scanner)
+        try:
+            reader = Reader(file(filename, 'rb'))
+            scanner = Scanner(reader)
+            parser = Parser(scanner)
+            return list(parser)
+        except YAMLError, exc:
+        #except ScannerError, exc:
+        #except ParserError, exc:
+            #print '.'*70
+            #print "%s:" % exc.__class__.__name__, exc
+            raise
 
     def _load_string(self, filename):
-        reader = Reader(file(filename, 'rb').read())
-        scanner = Scanner(reader)
-        return list(scanner)
+        try:
+            reader = Reader(file(filename, 'rb').read())
+            scanner = Scanner(reader)
+            parser = Parser(scanner)
+            return list(parser)
+        except YAMLError, exc:
+        #except ScannerError, exc:
+        #except ParserError, exc:
+            #print '.'*70
+            #print "%s:" % filename
+            #print "%s:" % exc.__class__.__name__, exc
+            raise
 
 TestErrors.add_tests('testErrors', '.error-message')