Changeset 328 for pyyaml/trunk/tests3/test_yaml_ext.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_yaml_ext.py (modified) (7 diffs)

pyyaml/trunk/tests3/test_yaml_ext.py

@@ -118 +118 @@
 def test_c_version(verbose=False):
     if verbose:
-        print _yaml.get_version()
-        print _yaml.get_version_string()
+        print(_yaml.get_version())
+        print(_yaml.get_version_string())
     assert ("%s.%s.%s" % _yaml.get_version()) == _yaml.get_version_string(),    \
             (_yaml.get_version(), _yaml.get_version_string())
@@ -144 +144 @@
     finally:
         if verbose:
-            print "PY_TOKENS:"
+            print("PY_TOKENS:")
             pprint.pprint(py_tokens)
-            print "C_TOKENS:"
+            print("C_TOKENS:")
             pprint.pprint(c_tokens)
 
@@ -177 +177 @@
     finally:
         if verbose:
-            print "PY_EVENTS:"
+            print("PY_EVENTS:")
             pprint.pprint(py_events)
-            print "C_EVENTS:"
+            print("C_EVENTS:")
             pprint.pprint(c_events)
 
@@ -199 +199 @@
     c_data = yaml.emit(events, Dumper=yaml.CDumper)
     if verbose:
-        print c_data
+        print(c_data)
     py_events = list(yaml.parse(c_data, Loader=yaml.PyLoader))
     c_events = list(yaml.parse(c_data, Loader=yaml.CLoader))
@@ -211 +211 @@
                 py_value = getattr(py_event, attribute, None)
                 c_value = getattr(c_event, attribute, None)
-                if attribute == 'tag' and value in [None, u'!'] \
-                        and py_value in [None, u'!'] and c_value in [None, u'!']:
+                if attribute == 'tag' and value in [None, '!'] \
+                        and py_value in [None, '!'] and c_value in [None, '!']:
                     continue
                 if attribute == 'explicit' and (py_value or c_value):
@@ -220 +220 @@
     finally:
         if verbose:
-            print "EVENTS:"
+            print("EVENTS:")
             pprint.pprint(events)
-            print "PY_EVENTS:"
+            print("PY_EVENTS:")
             pprint.pprint(py_events)
-            print "C_EVENTS:"
+            print("C_EVENTS:")
             pprint.pprint(c_events)
 
@@ -241 +241 @@
         finally:
             _tear_down()
-    try:
-        wrapper.func_name = '%s_ext' % function.func_name
-    except TypeError:
-        pass
-    wrapper.unittest_name = '%s_ext' % function.func_name
+    wrapper.__name__ = '%s_ext' % function.__name__
     wrapper.unittest = function.unittest
     wrapper.skip = getattr(function, 'skip', [])+['.skip-ext']