From 96f967f8bdc24c80b218506338684dde16f73dee Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 21 Sep 2014 00:49:49 +0400 Subject: [PATCH] Commit quote changes left from previous branch --- powerline/lint/markedjson/constructor.py | 12 ++++++------ powerline/lint/markedjson/reader.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/powerline/lint/markedjson/constructor.py b/powerline/lint/markedjson/constructor.py index 41b7d054..2a95d840 100644 --- a/powerline/lint/markedjson/constructor.py +++ b/powerline/lint/markedjson/constructor.py @@ -116,7 +116,7 @@ class BaseConstructor: if not isinstance(node, nodes.MappingNode): raise ConstructorError( None, None, - "expected a mapping node, but found %s" % node.id, + 'expected a mapping node, but found %s' % node.id, node.start_mark ) mapping = {} @@ -174,9 +174,9 @@ class Constructor(BaseConstructor): for subnode in value_node.value: if not isinstance(subnode, nodes.MappingNode): raise ConstructorError( - "while constructing a mapping", + 'while constructing a mapping', node.start_mark, - "expected a mapping for merging, but found %s" % subnode.id, + 'expected a mapping for merging, but found %s' % subnode.id, subnode.start_mark ) self.flatten_mapping(subnode) @@ -186,9 +186,9 @@ class Constructor(BaseConstructor): merge.extend(value) else: raise ConstructorError( - "while constructing a mapping", + 'while constructing a mapping', node.start_mark, - ("expected a mapping or list of mappings for merging, but found %s" % value_node.id), + ('expected a mapping or list of mappings for merging, but found %s' % value_node.id), value_node.start_mark ) elif key_node.tag == 'tag:yaml.org,2002:value': @@ -255,7 +255,7 @@ class Constructor(BaseConstructor): def construct_undefined(self, node): raise ConstructorError( None, None, - "could not determine a constructor for the tag %r" % node.tag, + 'could not determine a constructor for the tag %r' % node.tag, node.start_mark ) diff --git a/powerline/lint/markedjson/reader.py b/powerline/lint/markedjson/reader.py index 6b329bf9..bb518b06 100644 --- a/powerline/lint/markedjson/reader.py +++ b/powerline/lint/markedjson/reader.py @@ -42,7 +42,7 @@ class Reader(object): self.column = 0 self.stream = stream - self.name = getattr(stream, 'name', "") + self.name = getattr(stream, 'name', '') self.eof = False self.raw_buffer = None