From 4648530a503f1b35a094195d241c3e633f4fe11d Mon Sep 17 00:00:00 2001 From: rallytime Date: Fri, 30 Jan 2015 12:56:52 -0700 Subject: [PATCH] Fix pylint on develop --- .pylintrc | 2 +- .testing.pylintrc | 2 +- salt/client/mixins.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index 7feb6b9e52..242b093c34 100644 --- a/.pylintrc +++ b/.pylintrc @@ -194,7 +194,7 @@ dummy-variables-rgx=_|dummy # List of additional names supposed to be defined in builtins. Remember that # you should avoid to define new builtins when possible. -additional-builtins=__opts__,__salt__,__pillar__,__grains__,__context__,__ret__,__env__,__low__,__states__,__lowstate__,__running__,__active_provider_name__,__master_opts__,__jid_event__ +additional-builtins=__opts__,__salt__,__pillar__,__grains__,__context__,__ret__,__env__,__low__,__states__,__lowstate__,__running__,__active_provider_name__,__master_opts__,__jid_event__,__instance_id__ [SIMILARITIES] diff --git a/.testing.pylintrc b/.testing.pylintrc index 70feb01036..db2c74fd7d 100644 --- a/.testing.pylintrc +++ b/.testing.pylintrc @@ -154,7 +154,7 @@ indent-string=' ' # List of additional names supposed to be defined in builtins. Remember that # you should avoid to define new builtins when possible. -additional-builtins=__opts__,__salt__,__pillar__,__grains__,__context__,__ret__,__env__,__low__,__states__,__lowstate__,__running__,__active_provider_name__,__master_opts__,__jid_event__ +additional-builtins=__opts__,__salt__,__pillar__,__grains__,__context__,__ret__,__env__,__low__,__states__,__lowstate__,__running__,__active_provider_name__,__master_opts__,__jid_event__,__instance_id__ [IMPORTS] diff --git a/salt/client/mixins.py b/salt/client/mixins.py index 35e06d9fdf..fe7e91f4ca 100644 --- a/salt/client/mixins.py +++ b/salt/client/mixins.py @@ -185,7 +185,7 @@ class SyncClientMixin(object): # fire the mminion loading (if not already done) here # this is not to clutter the output with the module loading # if we have a high debug level. - self.mminion # pylint: disable=W0104 + self.mminion # pylint: disable=W0104 jid = low.get('__jid__', salt.utils.jid.gen_jid()) tag = low.get('__tag__', tagify(jid, prefix=self.tag_prefix))