Changeset 235 for pyyaml/trunk/lib/yaml/representer.py

Timestamp:

12/08/06 10:36:53 (6 years ago)

Author:

xi

Message:

Use the types module instead of constructing type objects by hand. Fix #41. Thanks to v.haisman@… for the patch.

File:

• pyyaml/trunk/lib/yaml/representer.py (modified) (4 diffs)

pyyaml/trunk/lib/yaml/representer.py

@@ -13 +13 @@
     from sets import Set as set
 
-import sys, copy_reg
+import sys, copy_reg, types
 
 class RepresenterError(YAMLError):
@@ -36 +36 @@
         self.object_keeper = []
         self.alias_key = None
-
-    class C: pass
-    c = C()
-    def f(): pass
-    def g(): yield None
-    classobj_type = type(C)
-    instance_type = type(c)
-    function_type = type(f)
-    generator_type = type(g())
-    builtin_function_type = type(abs)
-    module_type = type(sys)
-    del C, c, f, g
 
     def get_classobj_bases(self, cls):
@@ -69 +57 @@
             self.object_keeper.append(data)
         data_types = type(data).__mro__
-        if type(data) is self.instance_type:
+        if type(data) is types.InstanceType:
             data_types = self.get_classobj_bases(data.__class__)+list(data_types)
         if data_types[0] in self.yaml_representers:
@@ -472 +460 @@
         Representer.represent_name)
 
-Representer.add_representer(Representer.classobj_type,
+Representer.add_representer(types.ClassType,
         Representer.represent_name)
 
-Representer.add_representer(Representer.function_type,
+Representer.add_representer(types.FunctionType,
         Representer.represent_name)
 
-Representer.add_representer(Representer.builtin_function_type,
+Representer.add_representer(types.BuiltinFunctionType,
         Representer.represent_name)
 
-Representer.add_representer(Representer.module_type,
+Representer.add_representer(types.ModuleType,
         Representer.represent_module)
 
-Representer.add_multi_representer(Representer.instance_type,
+Representer.add_multi_representer(types.InstanceType,
         Representer.represent_instance)