tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-26 23:35:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Commit quote changes left from previous branch

Browse Source
This commit is contained in:
ZyX 2014-09-21 00:49:49 +04:00
parent 9eb6f996fa
commit 96f967f8bd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
powerline/lint/markedjson/constructor.py
View File

@ -116,7 +116,7 @@ class BaseConstructor:
if not isinstance(node, nodes.MappingNode): if not isinstance(node, nodes.MappingNode):
raise ConstructorError( raise ConstructorError(
None, None, None, None,
"expected a mapping node, but found %s" % node.id, 'expected a mapping node, but found %s' % node.id,
node.start_mark node.start_mark
) )
mapping = {} mapping = {}
@ -174,9 +174,9 @@ class Constructor(BaseConstructor):
for subnode in value_node.value: for subnode in value_node.value:
if not isinstance(subnode, nodes.MappingNode): if not isinstance(subnode, nodes.MappingNode):
raise ConstructorError( raise ConstructorError(
"while constructing a mapping", 'while constructing a mapping',
node.start_mark, 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 subnode.start_mark
) )
self.flatten_mapping(subnode) self.flatten_mapping(subnode)
@ -186,9 +186,9 @@ class Constructor(BaseConstructor):
merge.extend(value) merge.extend(value)
else: else:
raise ConstructorError( raise ConstructorError(
"while constructing a mapping", 'while constructing a mapping',
node.start_mark, 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 value_node.start_mark
) )
elif key_node.tag == 'tag:yaml.org,2002:value': elif key_node.tag == 'tag:yaml.org,2002:value':
@ -255,7 +255,7 @@ class Constructor(BaseConstructor):
def construct_undefined(self, node): def construct_undefined(self, node):
raise ConstructorError( raise ConstructorError(
None, None, 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 node.start_mark
) )

2
powerline/lint/markedjson/reader.py
View File

@ -42,7 +42,7 @@ class Reader(object):
self.column = 0 self.column = 0
self.stream = stream self.stream = stream
self.name = getattr(stream, 'name', "<file>") self.name = getattr(stream, 'name', '<file>')
self.eof = False self.eof = False
self.raw_buffer = None self.raw_buffer = None