Changeset 328 for pyyaml/trunk/tests3/test_structure.py

Timestamp:

12/29/08 12:24:05 (4 years ago)

Author:

xi

Message:

Added basic support for Python 3 (Thanks idadesub(at)users(dot)sourceforge(dot)net).

Location:

pyyaml/trunk/tests3

Files:

• . (copied) (copied from pyyaml/trunk/tests)
• test_structure.py (modified) (9 diffs)

pyyaml/trunk/tests3/test_structure.py

@@ -35 +35 @@
 def test_structure(data_filename, structure_filename, verbose=False):
     nodes1 = []
-    nodes2 = eval(open(structure_filename, 'rb').read())
+    nodes2 = eval(open(structure_filename, 'r').read())
     try:
         loader = yaml.Loader(open(data_filename, 'rb'))
@@ -49 +49 @@
     finally:
         if verbose:
-            print "NODES1:"
+            print("NODES1:")
             pprint.pprint(nodes1)
-            print "NODES2:"
+            print("NODES2:")
             pprint.pprint(nodes2)
 
@@ -63 +63 @@
             assert event1.anchor == event2.anchor, (event1, event2)
         if isinstance(event1, (yaml.ScalarEvent, yaml.CollectionStartEvent)):
-            if (event1.tag not in [None, u'!'] and event2.tag not in [None, u'!']) or full:
+            if (event1.tag not in [None, '!'] and event2.tag not in [None, '!']) or full:
                 assert event1.tag == event2.tag, (event1, event2)
         if isinstance(event1, yaml.ScalarEvent):
@@ -77 +77 @@
     finally:
         if verbose:
-            print "EVENTS1:"
+            print("EVENTS1:")
             pprint.pprint(events1)
-            print "EVENTS2:"
+            print("EVENTS2:")
             pprint.pprint(events2)
 
@@ -93 +93 @@
     finally:
         if verbose:
-            print "EVENTS1:"
+            print("EVENTS1:")
             pprint.pprint(events1)
-            print "EVENTS2:"
+            print("EVENTS2:")
             pprint.pprint(events2)
 
@@ -125 +125 @@
     finally:
         if verbose:
-            print "NODES1:"
+            print("NODES1:")
             pprint.pprint(nodes1)
-            print "NODES2:"
+            print("NODES2:")
             pprint.pprint(nodes2)
 
@@ -145 +145 @@
             return self.construct_scalar(node)
 
-    MyLoader.add_constructor(u'tag:yaml.org,2002:map', MyLoader.construct_mapping)
+    MyLoader.add_constructor('tag:yaml.org,2002:map', MyLoader.construct_mapping)
     MyLoader.add_constructor(None, MyLoader.construct_undefined)
 
@@ -161 +161 @@
             return self.construct_scalar(node)
 
-    MyCanonicalLoader.add_constructor(u'tag:yaml.org,2002:map', MyCanonicalLoader.construct_mapping)
+    MyCanonicalLoader.add_constructor('tag:yaml.org,2002:map', MyCanonicalLoader.construct_mapping)
     MyCanonicalLoader.add_constructor(None, MyCanonicalLoader.construct_undefined)
 
@@ -175 +175 @@
     finally:
         if verbose:
-            print "NATIVE1:"
+            print("NATIVE1:")
             pprint.pprint(native1)
-            print "NATIVE2:"
+            print("NATIVE2:")
             pprint.pprint(native2)