fixed pylint issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/7b8a4187 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7b8a4187 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7b8a4187 Branch: refs/heads/ARIA-138-Make-logging-more-informative Commit: 7b8a4187948683a63355d652636254de7abc3b1a Parents: 402eeb4 Author: Ran Ziv <r...@gigaspaces.com> Authored: Thu Apr 13 12:23:26 2017 +0300 Committer: Ran Ziv <r...@gigaspaces.com> Committed: Thu Apr 13 12:23:26 2017 +0300 ---------------------------------------------------------------------- aria/.pylintrc | 2 +- aria/modeling/utils.py | 4 ++-- aria/orchestrator/context/common.py | 5 +++-- aria/orchestrator/context/operation.py | 2 -- aria/orchestrator/context/workflow.py | 4 +--- aria/utils/threading.py | 4 ++-- aria/utils/type.py | 2 +- tests/.pylintrc | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/.pylintrc ---------------------------------------------------------------------- diff --git a/aria/.pylintrc b/aria/.pylintrc index 7222605..7da8c56 100644 --- a/aria/.pylintrc +++ b/aria/.pylintrc @@ -77,7 +77,7 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,redefined-builtin,logging-format-interpolation,import-error,redefined-variable-type,broad-except,protected-access,global-statement,no-member +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,redefined-builtin,logging-format-interpolation,import-error,redefined-variable-type,broad-except,protected-access,global-statement,no-member,u nused-argument [REPORTS] http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/modeling/utils.py ---------------------------------------------------------------------- diff --git a/aria/modeling/utils.py b/aria/modeling/utils.py index acae065..917f495 100644 --- a/aria/modeling/utils.py +++ b/aria/modeling/utils.py @@ -26,7 +26,7 @@ from ..utils.type import validate_value_type class ModelJSONEncoder(JSONEncoder): - def default(self, o): + def default(self, o): # pylint: disable=method-hidden from .mixins import ModelMixin if isinstance(o, ModelMixin): if hasattr(o, 'value'): @@ -56,7 +56,7 @@ def create_inputs(inputs, template_inputs): value=input_val) input_models.append(parameter) - return {input.name: input for input in input_models} + return dict((inp.name, inp) for inp in input_models) def _merge_and_validate_inputs(inputs, template_inputs): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/orchestrator/context/common.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/context/common.py b/aria/orchestrator/context/common.py index 11b5eb9..15843db 100644 --- a/aria/orchestrator/context/common.py +++ b/aria/orchestrator/context/common.py @@ -29,7 +29,6 @@ from aria import ( ) from aria.storage import exceptions -from ... import logger from ...utils.uuid import generate_uuid @@ -55,6 +54,7 @@ class BaseContext(object): self, name, service_id, + execution_id, model_storage, resource_storage, workdir=None, @@ -65,12 +65,13 @@ class BaseContext(object): self._model = model_storage self._resource = resource_storage self._service_id = service_id + self._execution_id = execution_id self._workdir = workdir self.logger = None def _register_logger(self, level=None, task_id=None): self.logger = self.PrefixedLogger( - logging.getLogger(logger.TASK_LOGGER_NAME), self.logging_id, task_id=task_id) + logging.getLogger(aria_logger.TASK_LOGGER_NAME), self.logging_id, task_id=task_id) self.logger.setLevel(level or logging.DEBUG) if not self.logger.handlers: self.logger.addHandler(aria_logger.create_console_log_handler()) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/orchestrator/context/operation.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/context/operation.py b/aria/orchestrator/context/operation.py index cbd186c..c7d8246 100644 --- a/aria/orchestrator/context/operation.py +++ b/aria/orchestrator/context/operation.py @@ -36,7 +36,6 @@ class BaseOperationContext(BaseContext): service_id, task_id, actor_id, - execution_id, **kwargs): super(BaseOperationContext, self).__init__( name=name, @@ -47,7 +46,6 @@ class BaseOperationContext(BaseContext): self._task_id = task_id self._actor_id = actor_id self._thread_local = threading.local() - self._execution_id = execution_id self._register_logger(task_id=self.task.id) def __repr__(self): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/orchestrator/context/workflow.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/context/workflow.py b/aria/orchestrator/context/workflow.py index ad4a2ff..667d22f 100644 --- a/aria/orchestrator/context/workflow.py +++ b/aria/orchestrator/context/workflow.py @@ -30,7 +30,6 @@ class WorkflowContext(BaseContext): """ def __init__(self, workflow_name, - execution_id, parameters=None, task_max_attempts=1, task_retry_interval=0, @@ -38,11 +37,10 @@ class WorkflowContext(BaseContext): *args, **kwargs): super(WorkflowContext, self).__init__(*args, **kwargs) self._workflow_name = workflow_name - self.parameters = parameters or {} + self._parameters = parameters or {} self._task_max_attempts = task_max_attempts self._task_retry_interval = task_retry_interval self._task_ignore_failure = task_ignore_failure - self._execution_id = execution_id self._register_logger() def __repr__(self): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/utils/threading.py ---------------------------------------------------------------------- diff --git a/aria/utils/threading.py b/aria/utils/threading.py index 06c48bc..bfd30f5 100644 --- a/aria/utils/threading.py +++ b/aria/utils/threading.py @@ -277,5 +277,5 @@ class ExceptionThread(Thread): def raise_error_if_exists(self): if self.is_error(): - type_, value, tb = self.exception - raise type_, value, tb + type_, value, trace = self.exception + raise type_, value, trace http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/aria/utils/type.py ---------------------------------------------------------------------- diff --git a/aria/utils/type.py b/aria/utils/type.py index fff0f2a..dad5427 100644 --- a/aria/utils/type.py +++ b/aria/utils/type.py @@ -40,7 +40,7 @@ def validate_value_type(value, type_name): if type_ is None: raise RuntimeError('No supported type_name was provided') - if type(value) != type_: + if not isinstance(value, type_): raise ValueError('Value {0} is not of type {1}'.format(value, type_name)) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b8a4187/tests/.pylintrc ---------------------------------------------------------------------- diff --git a/tests/.pylintrc b/tests/.pylintrc index 06409e9..eead6e8 100644 --- a/tests/.pylintrc +++ b/tests/.pylintrc @@ -77,7 +77,7 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,redefined-builtin,no-self-use,missing-docstring,attribute-defined-outside-init,redefined-outer-name,import-error,redefined-variable-type,broad -except,protected-access,global-statement,too-many-locals,abstract-method,no-member +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,redefined-builtin,no-self-use,missing-docstring,attribute-defined-outside-init,redefined-outer-name,import-error,redefined-variable-type,broad -except,protected-access,global-statement,too-many-locals,abstract-method,no-member,unused-argument [REPORTS]