Ticket #110: less-if.patch

lib/yaml/resolver.py

@@ -158 +158 @@
             return self.DEFAULT_SCALAR_TAG
         elif kind is SequenceNode:
             return self.DEFAULT_SEQUENCE_TAG
-        elif kind is MappingNode:
+        else:
             return self.DEFAULT_MAPPING_TAG
 
 class Resolver(BaseResolver):

lib/yaml/scanner.py

@@ -126 +126 @@
         # Return the next token, but do not delete if from the queue.
         while self.need_more_tokens():
             self.fetch_more_tokens()
-        if self.tokens:
-            return self.tokens[0]
+        return self.tokens[0]
 
     def get_token(self):
         # Return the next token.
-        while self.need_more_tokens():
-            self.fetch_more_tokens()
         if self.tokens:
             self.tokens_taken += 1
             return self.tokens.pop(0)

lib/yaml/serializer.py

@@ -98 +98 @@
                     self.serialize_node(item, node, index)
                     index += 1
                 self.emit(SequenceEndEvent())
-            elif isinstance(node, MappingNode):
+            else: # MappingNode
                 implicit = (node.tag
                             == self.resolve(MappingNode, node.value, True))
                 self.emit(MappingStartEvent(alias, node.tag, implicit,