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

Rename YAMLError to JSONError and MarkedYAMLError to MarkedError

Browse Source
This commit is contained in:
ZyX 2013-03-11 08:00:40 +04:00
parent 5da848fa4a
commit 49ad855eb5
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
powerline/lint/markedjson/composer.py
View File

@ -1,11 +1,11 @@
__all__ = ['Composer', 'ComposerError'] __all__ = ['Composer', 'ComposerError']
from .error import MarkedYAMLError from .error import MarkedError
from .events import * # NOQA from .events import * # NOQA
from .nodes import * # NOQA from .nodes import * # NOQA
class ComposerError(MarkedYAMLError): class ComposerError(MarkedError):
pass pass

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

@ -1,6 +1,6 @@
__all__ = ['BaseConstructor', 'Constructor', 'ConstructorError'] __all__ = ['BaseConstructor', 'Constructor', 'ConstructorError']
from .error import MarkedYAMLError from .error import MarkedError
from .nodes import * # NOQA from .nodes import * # NOQA
from .markedvalue import gen_marked_value from .markedvalue import gen_marked_value
@ -23,7 +23,7 @@ def marked(func):
return f return f
class ConstructorError(MarkedYAMLError): class ConstructorError(MarkedError):
pass pass

8
powerline/lint/markedjson/error.py
View File

@ -1,4 +1,4 @@
__all__ = ['Mark', 'YAMLError', 'MarkedYAMLError', 'echoerr'] __all__ = ['Mark', 'JSONError', 'MarkedError', 'echoerr']
import sys import sys
@ -53,7 +53,7 @@ class Mark:
return where.encode('utf-8') return where.encode('utf-8')
class YAMLError(Exception): class JSONError(Exception):
pass pass
@ -81,8 +81,8 @@ def format_error(context=None, context_mark=None, problem=None, problem_mark=Non
return '\n'.join(lines) return '\n'.join(lines)
class MarkedYAMLError(YAMLError): class MarkedError(JSONError):
def __init__(self, context=None, context_mark=None, def __init__(self, context=None, context_mark=None,
problem=None, problem_mark=None, note=None): problem=None, problem_mark=None, note=None):
YAMLError.__init__(self, format_error(context, context_mark, problem, JSONError.__init__(self, format_error(context, context_mark, problem,
problem_mark, note)) problem_mark, note))

4
powerline/lint/markedjson/parser.py
View File

@ -1,11 +1,11 @@
__all__ = ['Parser', 'ParserError'] __all__ = ['Parser', 'ParserError']
from .error import MarkedYAMLError from .error import MarkedError
from .tokens import * # NOQA from .tokens import * # NOQA
from .events import * # NOQA from .events import * # NOQA
class ParserError(MarkedYAMLError): class ParserError(MarkedError):
pass pass

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

@ -3,7 +3,7 @@
__all__ = ['Reader', 'ReaderError'] __all__ = ['Reader', 'ReaderError']
from .error import YAMLError, Mark from .error import JSONError, Mark
import codecs import codecs
import re import re
@ -15,7 +15,7 @@ except ImportError:
unichr = chr # NOQA unichr = chr # NOQA
class ReaderError(YAMLError): class ReaderError(JSONError):
def __init__(self, name, position, character, encoding, reason): def __init__(self, name, position, character, encoding, reason):
self.name = name self.name = name
self.character = character self.character = character

4
powerline/lint/markedjson/resolver.py
View File

@ -1,12 +1,12 @@
__all__ = ['BaseResolver', 'Resolver'] __all__ = ['BaseResolver', 'Resolver']
from .error import MarkedYAMLError from .error import MarkedError
from .nodes import * # NOQA from .nodes import * # NOQA
import re import re
class ResolverError(MarkedYAMLError): class ResolverError(MarkedError):
pass pass

4
powerline/lint/markedjson/scanner.py
View File

@ -16,11 +16,11 @@
__all__ = ['Scanner', 'ScannerError'] __all__ = ['Scanner', 'ScannerError']
from .error import MarkedYAMLError from .error import MarkedError
from .tokens import * # NOQA from .tokens import * # NOQA
class ScannerError(MarkedYAMLError): class ScannerError(MarkedError):
pass pass