From 56674aa3a949fafe866cf3b16a7af25dac55ea78 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Thu, 7 Dec 2017 14:58:11 +0000 Subject: [PATCH] framework/plugin: Satisfy pylint's nitpicks --- wa/framework/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wa/framework/plugin.py b/wa/framework/plugin.py index a6ddff2a..73a76924 100644 --- a/wa/framework/plugin.py +++ b/wa/framework/plugin.py @@ -83,7 +83,7 @@ class AttributeCollection(object): def _to_attrcls(self, p): if not isinstance(p, self._attrcls): raise ValueError('Invalid attribute value: {}; must be a {}'.format(p, self._attrcls)) - if (p.name in self._attrs and not p.override): + if p.name in self._attrs and not p.override: raise ValueError('Attribute {} has already been defined.'.format(p.name)) return p @@ -111,7 +111,7 @@ class AliasCollection(AttributeCollection): super(AliasCollection, self).__init__(Alias) def _to_attrcls(self, p): - if isinstance(p, tuple) or isinstance(p, list): + if isinstance(p, (list, tuple)): # must be in the form (name, {param: value, ...}) p = self._attrcls(p[1], **p[1]) elif not isinstance(p, self._attrcls):