Index: branches/pyyaml3000/tests/test_tokens.py
===================================================================
--- branches/pyyaml3000/tests/test_tokens.py	(revision 44)
+++ branches/pyyaml3000/tests/test_tokens.py	(revision 46)
@@ -2,4 +2,6 @@
 import test_appliance
 
+from yaml.reader import *
+from yaml.tokens import *
 from yaml.scanner import *
 
@@ -51,5 +53,5 @@
         tokens2 = file(tokens_filename, 'rb').read().split()
         try:
-            scanner = Scanner(data_filename, file(data_filename, 'rb').read())
+            scanner = Scanner(Reader(file(data_filename, 'rb')))
             tokens1 = []
             while not isinstance(scanner.peek_token(), EndToken):
@@ -73,5 +75,5 @@
             tokens = None
             try:
-                scanner = Scanner(filename, file(filename, 'rb').read())
+                scanner = Scanner(Reader(file(filename, 'rb')))
                 tokens = []
                 while not isinstance(scanner.peek_token(), EndToken):