diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-02-18 12:14:43 +0800 |
---|---|---|
committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-02-21 16:58:50 +0800 |
commit | b19344b16a3000180cac33e1239d62c7c6c3e5ea (patch) | |
tree | 3cbc2f13021d711026fe61a52b790c24f945fd04 /qtip/loader | |
parent | 0dca380fe84e42309d3c3a66b3f31ec2f645caf5 (diff) |
Refactoring qtip.base.error
- move method make_tbd to qtip.util.dev
- add suffix Error to follow the Python naming convention
- rename arguments of NotFoundError to make it generic
Change-Id: I81e406b7fa10c3b40004434f6a9c2e7bbf7603ee
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'qtip/loader')
-rw-r--r-- | qtip/loader/file.py | 4 | ||||
-rw-r--r-- | qtip/loader/yaml_file.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qtip/loader/file.py b/qtip/loader/file.py index 0ea4d5b6..038f57dd 100644 --- a/qtip/loader/file.py +++ b/qtip/loader/file.py @@ -12,7 +12,7 @@ from os import listdir from os import path from qtip.base.constant import BaseProp -from qtip.base.error import NotFound +from qtip.base.error import NotFoundError from qtip.loader.base import BaseLoader @@ -35,7 +35,7 @@ class FileLoader(BaseLoader): abspath = path.join(p, self.RELATIVE_PATH, name) if path.exists(abspath): return abspath - raise NotFound(name, paths) + raise NotFoundError(name, paths) @classmethod def list_all(cls, paths=None): diff --git a/qtip/loader/yaml_file.py b/qtip/loader/yaml_file.py index 8b78a47c..7ff838f9 100644 --- a/qtip/loader/yaml_file.py +++ b/qtip/loader/yaml_file.py @@ -10,7 +10,7 @@ from os import path import yaml -from qtip.base.error import InvalidContent +from qtip.base.error import InvalidContentError from qtip.base.constant import BaseProp from qtip.loader.file import FileLoader @@ -25,6 +25,6 @@ class YamlFileLoader(FileLoader): with open(abspath, 'r') as stream: content = yaml.safe_load(stream) if not isinstance(content, dict): - raise InvalidContent(abspath) + raise InvalidContentError(abspath) self.content = content self.name = content.get(BaseProp.NAME, path.splitext(name)[0]) |