Changeset 331 for pyyaml/trunk/tests

Timestamp:

12/29/08 18:21:43 (3 years ago)

Author:

xi

Message:

Use Cython if available; added Python 3 support to _yaml.pyx.

Location:

pyyaml/trunk/tests/lib3

Files:

• test_structure.py (modified) (2 diffs)
• test_yaml_ext.py (modified) (1 diff)

pyyaml/trunk/tests/lib3/test_structure.py

@@ -140 +140 @@
         def construct_mapping(self, node):
             pairs = self.construct_pairs(node)
-            pairs.sort()
+            pairs.sort(key=(lambda i: str(i)))
             return pairs
         def construct_undefined(self, node):
@@ -156 +156 @@
         def construct_mapping(self, node):
             pairs = self.construct_pairs(node)
-            pairs.sort()
+            pairs.sort(key=(lambda i: str(i)))
             return pairs
         def construct_undefined(self, node):

pyyaml/trunk/tests/lib3/test_yaml_ext.py

@@ -253 +253 @@
         if not isinstance(collection, dict):
             collection = vars(collection)
-        keys = collection.keys()
-        keys.sort()
-        for key in keys:
+        for key in sorted(collection):
             value = collection[key]
             if isinstance(value, types.FunctionType) and hasattr(value, 'unittest'):
                 functions.append(wrap_ext_function(value))
     for function in functions:
-        assert function.unittest_name not in globals()
-        globals()[function.unittest_name] = function
+        assert function.__name__ not in globals()
+        globals()[function.__name__] = function
 
 import test_tokens, test_structure, test_errors, test_resolver, test_constructor,   \