Index: branches/pyyaml3000/tests/test_tokens.py
===================================================================
--- branches/pyyaml3000/tests/test_tokens.py	(revision 48)
+++ branches/pyyaml3000/tests/test_tokens.py	(revision 51)
@@ -42,5 +42,6 @@
         FlowMappingStartToken: '{',
         FlowMappingEndToken: '}',
-        EntryToken: ',',
+        BlockEntryToken: ',',
+        FlowEntryToken: ',',
         KeyToken: '?',
         ValueToken: ':',
@@ -53,6 +54,7 @@
             scanner = Scanner(Reader(file(data_filename, 'rb')))
             tokens1 = []
-            while not isinstance(scanner.peek_token(), StreamEndToken):
-                tokens1.append(scanner.get_token())
+            for token in scanner:
+                if not isinstance(token, StreamEndToken):
+                    tokens1.append(token)
             tokens1 = [self.replaces[t.__class__] for t in tokens1]
             self.failUnlessEqual(tokens1, tokens2)
@@ -75,6 +77,7 @@
                 scanner = Scanner(Reader(file(filename, 'rb')))
                 tokens = []
-                while not isinstance(scanner.peek_token(), StreamEndToken):
-                    tokens.append(scanner.get_token().__class__.__name__)
+                for token in scanner:
+                    if not isinstance(token, StreamEndToken):
+                        tokens.append(token.__class__.__name__)
             except:
                 print