Index: branches/pyyaml3000/lib/yaml/parser.py
===================================================================
--- branches/pyyaml3000/lib/yaml/parser.py	(revision 44)
+++ branches/pyyaml3000/lib/yaml/parser.py	(revision 46)
@@ -40,7 +40,8 @@
 # flow_mapping_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
 
-from scanner import *
-
-class Error(Exception):
+from error import YAMLError
+from tokens import *
+
+class ParserError(YAMLError):
     pass
 
@@ -77,6 +78,6 @@
 class Parser:
 
-    def __init__(self, source, data):
-        self.scanner = Scanner(source, data)
+    def __init__(self, scanner):
+        self.scanner = scanner
 
     def is_token(self, *choices):