From 83b1bee14f9d082e761f347470a047f39b73c053 Mon Sep 17 00:00:00 2001 From: Maxim Kulkin Date: Tue, 17 Sep 2013 16:19:03 +0400 Subject: [PATCH] Moved Issue type into Issue class --- ostack_validator/common.py | 8 ++++---- ostack_validator/config_formats/common.py | 4 ++-- ostack_validator/inspection.py | 2 +- ostack_validator/schema.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ostack_validator/common.py b/ostack_validator/common.py index 3b462ee..98f9279 100644 --- a/ostack_validator/common.py +++ b/ostack_validator/common.py @@ -91,11 +91,11 @@ class Error: def __str__(self): return self.message -ERROR = 'ERROR' -WARNING = 'WARNING' -INFO = 'INFO' - class Issue(object): + ERROR = 'ERROR' + WARNING = 'WARNING' + INFO = 'INFO' + def __init__(self, type, message): self.type = type self.message = message diff --git a/ostack_validator/config_formats/common.py b/ostack_validator/config_formats/common.py index 8a55ac8..ce91169 100644 --- a/ostack_validator/config_formats/common.py +++ b/ostack_validator/config_formats/common.py @@ -1,6 +1,6 @@ -from ostack_validator.common import Mark, MarkedIssue, ERROR +from ostack_validator.common import Mark, Issue, MarkedIssue class ParseError(MarkedIssue): def __init__(self, message, mark): - super(ParseError, self).__init__(ERROR, message, mark) + super(ParseError, self).__init__(Issue.ERROR, message, mark) diff --git a/ostack_validator/inspection.py b/ostack_validator/inspection.py index 74f342f..b5851c8 100644 --- a/ostack_validator/inspection.py +++ b/ostack_validator/inspection.py @@ -1,6 +1,6 @@ import logging -from ostack_validator.common import Error, Mark, Issue, Inspection +from ostack_validator.common import Error, Mark, Issue, MarkedIssue, Inspection from ostack_validator.schema import ConfigSchemaRegistry, TypeValidatorRegistry import ostack_validator.schemas diff --git a/ostack_validator/schema.py b/ostack_validator/schema.py index b9df7af..c2e9207 100644 --- a/ostack_validator/schema.py +++ b/ostack_validator/schema.py @@ -1,6 +1,6 @@ import sys -from ostack_validator.common import Inspection, MarkedIssue, ERROR, Mark, Version, find, index +from ostack_validator.common import Inspection, Issue, MarkedIssue, Mark, Version, find, index class SchemaUpdateRecord(object): # checkpoint's data is version number @@ -167,7 +167,7 @@ class TypeValidatorRegistry: class InvalidValueError(MarkedIssue): def __init__(self, message, mark=Mark('', 1, 1)): - super(InvalidValueError, self).__init__(ERROR, message, mark) + super(InvalidValueError, self).__init__(Issue.ERROR, message, mark) class TypeValidator(object): def __init__(self, f):