From a9d1a18af94f3e0f0ac669c51f3acfb1c03058f0 Mon Sep 17 00:00:00 2001 From: hochikong <1097225749@qq.com> Date: Wed, 24 Aug 2016 14:56:00 +0800 Subject: Fix some mistakes in README and check all codes by 2to3 --- vymgmt/base_exception/__init__.py | 0 vymgmt/base_exception/base.py | 15 --------------- vymgmt/base_exception/exception_for_commit.py | 21 --------------------- .../exceptions_for_set_and_delete.py | 22 ---------------------- vymgmt/base_exceptions/__init__.py | 0 vymgmt/base_exceptions/base.py | 15 +++++++++++++++ vymgmt/base_exceptions/exceptions_for_commit.py | 21 +++++++++++++++++++++ .../exceptions_for_set_and_delete.py | 22 ++++++++++++++++++++++ vymgmt/router.py | 8 ++++---- 9 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 vymgmt/base_exception/__init__.py delete mode 100644 vymgmt/base_exception/base.py delete mode 100644 vymgmt/base_exception/exception_for_commit.py delete mode 100644 vymgmt/base_exception/exceptions_for_set_and_delete.py create mode 100644 vymgmt/base_exceptions/__init__.py create mode 100644 vymgmt/base_exceptions/base.py create mode 100644 vymgmt/base_exceptions/exceptions_for_commit.py create mode 100644 vymgmt/base_exceptions/exceptions_for_set_and_delete.py (limited to 'vymgmt') diff --git a/vymgmt/base_exception/__init__.py b/vymgmt/base_exception/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/vymgmt/base_exception/base.py b/vymgmt/base_exception/base.py deleted file mode 100644 index dc80840..0000000 --- a/vymgmt/base_exception/base.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Hochikong - -prefix = "\r\n" - - -class Error(Exception): - pass - - -class CommonError(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message diff --git a/vymgmt/base_exception/exception_for_commit.py b/vymgmt/base_exception/exception_for_commit.py deleted file mode 100644 index 26c14c4..0000000 --- a/vymgmt/base_exception/exception_for_commit.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016 Hochikong - -from .base import Error - -prefix = "\r\n" - - -class CommitFailed(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message - - -class CommitConflict(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message diff --git a/vymgmt/base_exception/exceptions_for_set_and_delete.py b/vymgmt/base_exception/exceptions_for_set_and_delete.py deleted file mode 100644 index 0f65c88..0000000 --- a/vymgmt/base_exception/exceptions_for_set_and_delete.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2016 Hochikong - - -from .base import Error - -prefix = "\r\n" - - -class ConfigPathError(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message - - -class ConfigValueError(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message diff --git a/vymgmt/base_exceptions/__init__.py b/vymgmt/base_exceptions/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vymgmt/base_exceptions/base.py b/vymgmt/base_exceptions/base.py new file mode 100644 index 0000000..dc80840 --- /dev/null +++ b/vymgmt/base_exceptions/base.py @@ -0,0 +1,15 @@ +# Copyright (c) 2016 Hochikong + +prefix = "\r\n" + + +class Error(Exception): + pass + + +class CommonError(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message diff --git a/vymgmt/base_exceptions/exceptions_for_commit.py b/vymgmt/base_exceptions/exceptions_for_commit.py new file mode 100644 index 0000000..26c14c4 --- /dev/null +++ b/vymgmt/base_exceptions/exceptions_for_commit.py @@ -0,0 +1,21 @@ +# Copyright (c) 2016 Hochikong + +from .base import Error + +prefix = "\r\n" + + +class CommitFailed(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message + + +class CommitConflict(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message diff --git a/vymgmt/base_exceptions/exceptions_for_set_and_delete.py b/vymgmt/base_exceptions/exceptions_for_set_and_delete.py new file mode 100644 index 0000000..0f65c88 --- /dev/null +++ b/vymgmt/base_exceptions/exceptions_for_set_and_delete.py @@ -0,0 +1,22 @@ +# Copyright (c) 2016 Hochikong + + +from .base import Error + +prefix = "\r\n" + + +class ConfigPathError(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message + + +class ConfigValueError(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message diff --git a/vymgmt/router.py b/vymgmt/router.py index 955a9ba..f46955d 100644 --- a/vymgmt/router.py +++ b/vymgmt/router.py @@ -2,10 +2,10 @@ from pxssh import pxssh -from mgmt_common import messenger, committer -from .base_exception.exceptions_for_set_and_delete import ConfigPathError, ConfigValueError -from .base_exception.exception_for_commit import CommitFailed, CommitConflict -from .base_exception.base import CommonError +from .mgmt_common import messenger, committer +from .base_exceptions.exceptions_for_set_and_delete import ConfigPathError, ConfigValueError +from .base_exceptions.exceptions_for_commit import CommitFailed, CommitConflict +from .base_exceptions.base import CommonError from .error_distinguish import distinguish_for_set, distinguish_for_delete, distinguish_for_commit -- cgit v1.2.3