Changeset 136 for pyyaml/trunk/tests/test_tokens.py

Timestamp:

04/15/06 19:54:52 (7 years ago)

Author:

xi

Message:

Major refactoring.

File:

• pyyaml/trunk/tests/test_tokens.py (modified) (3 diffs)

pyyaml/trunk/tests/test_tokens.py

@@ -2 +2 @@
 import test_appliance
 
-from yaml.reader import *
-from yaml.tokens import *
-from yaml.scanner import *
+from yaml import *
 
 class TestTokens(test_appliance.TestAppliance):
@@ -52 +50 @@
         tokens2 = file(tokens_filename, 'rb').read().split()
         try:
-            scanner = Scanner(Reader(file(data_filename, 'rb')))
             tokens1 = []
-            for token in scanner:
+            for token in scan(file(data_filename, 'rb')):
                 if not isinstance(token, (StreamStartToken, StreamEndToken)):
                     tokens1.append(token)
@@ -75 +72 @@
             tokens = None
             try:
-                scanner = Scanner(Reader(file(filename, 'rb')))
                 tokens = []
-                for token in scanner:
+                for token in scan(file(filename, 'rb')):
                     if not isinstance(token, (StreamStartToken, StreamEndToken)):
                         tokens.append(token.__class__.__name__)