diff --git a/.pylintrc b/.pylintrc index c723cd37017..fbf048414d2 100644 --- a/.pylintrc +++ b/.pylintrc @@ -179,8 +179,6 @@ disable= redefined-argument-from-local, consider-using-ternary, literal-comparison, - consider-merging-isinstance, - consider-merging-isinstance, too-many-boolean-expressions, useless-object-inheritance, trailing-comma-tuple, diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py index cb88b409846..ecc74631c98 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/cinder/db/sqlalchemy/api.py @@ -1880,7 +1880,7 @@ def _process_model_like_filter(model, query, filters): if 'property' == type(column_attr).__name__: continue value = filters[key] - if not (isinstance(value, six.string_types) or isinstance(value, int)): + if not (isinstance(value, (six.string_types, int))): continue query = query.filter( column_attr.op('LIKE')(u'%%%s%%' % value)) diff --git a/cinder/hacking/checks.py b/cinder/hacking/checks.py index 0443b24ec4d..1a1cf8a38de 100644 --- a/cinder/hacking/checks.py +++ b/cinder/hacking/checks.py @@ -315,7 +315,7 @@ class CheckOptRegistrationArgs(BaseASTChecker): return None def _is_list_or_tuple(self, obj): - return isinstance(obj, ast.List) or isinstance(obj, ast.Tuple) + return isinstance(obj, (ast.List, ast.Tuple)) def visit_Call(self, node): """Look for the register_opt/register_opts calls."""