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

Timestamp:

12/08/06 10:36:53 (5 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.

Files:

• pyyaml/trunk/lib/yaml/constructor.py (modified) (3 diffs)

pyyaml/trunk/lib/yaml/constructor.py

@@ -13 +13 @@
     from sets import Set as set
 
-import binascii, re, sys
+import binascii, re, sys, types
 
 class ConstructorError(MarkedYAMLError):
@@ -37 +37 @@
         if self.check_node():
             return self.construct_document(self.get_node())
-
-    def g(): yield None
-    generator_type = type(g())
-    del g
 
     def construct_document(self, node):
@@ -92 +88 @@
         else:
             data = constructor(self, tag_suffix, node)
-        if isinstance(data, self.generator_type):
+        if isinstance(data, types.GeneratorType):
             generator = data
             data = generator.next()