diff options
author | Anthon van der Neut <anthon@mnt.org> | 2017-03-21 17:18:18 +0100 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2017-03-21 17:18:18 +0100 |
commit | 9ac44a0873d51d63150b0f1dc1d009b206577a29 (patch) | |
tree | 44fc2ecbdba2a6a63544097d7b9f63d8f87d5aae /error.py | |
parent | c8568f99215aaa910953287f63a25459e3800dfc (diff) | |
download | ruamel.yaml-9ac44a0873d51d63150b0f1dc1d009b206577a29.tar.gz |
update for mypy --strict, prepare de-inheritance (Loader/Dumper)0.14.0
Diffstat (limited to 'error.py')
-rw-r--r-- | error.py | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -4,25 +4,28 @@ from __future__ import absolute_import import warnings -from typing import Any, Dict, Optional, List # NOQA +from typing import Any, Dict, Optional, List, Text # NOQA from ruamel.yaml.compat import utf8 -__all__ = ['FileMark', 'StringMark', 'CommentMark', - 'YAMLError', 'MarkedYAMLError', 'ReusedAnchorWarning', - 'UnsafeLoaderWarning'] +__all__ = [ + 'FileMark', 'StringMark', 'CommentMark', 'YAMLError', 'MarkedYAMLError', + 'ReusedAnchorWarning', 'UnsafeLoaderWarning', +] class StreamMark(object): __slots__ = 'name', 'index', 'line', 'column', def __init__(self, name, index, line, column): + # type: (Any, int, int, int) -> None self.name = name self.index = index self.line = line self.column = column def __str__(self): + # type: () -> Any where = " in \"%s\", line %d, column %d" \ % (self.name, self.line+1, self.column+1) return where @@ -36,11 +39,13 @@ class StringMark(StreamMark): __slots__ = 'name', 'index', 'line', 'column', 'buffer', 'pointer', def __init__(self, name, index, line, column, buffer, pointer): + # type: (Any, int, int, int, Any, Any) -> None StreamMark.__init__(self, name, index, line, column) self.buffer = buffer self.pointer = pointer def get_snippet(self, indent=4, max_length=75): + # type: (int, int) -> Any if self.buffer is None: # always False return None head = '' @@ -68,6 +73,7 @@ class StringMark(StreamMark): + ' '*(indent+self.pointer-start+len(head)) + caret def __str__(self): + # type: () -> Any snippet = self.get_snippet() where = " in \"%s\", line %d, column %d" \ % (self.name, self.line+1, self.column+1) @@ -99,8 +105,8 @@ class MarkedYAMLError(YAMLError): self.note = note def __str__(self): - # type: () -> str - lines = [] + # type: () -> Any + lines = [] # type: List[str] if self.context is not None: lines.append(self.context) if self.context_mark is not None \ |