valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[2018.3] Fix some pylint issues that have popped up recently

Browse Source
This commit is contained in:
rallytime 2018-10-15 13:29:54 -04:00
parent fef7669a15
commit e73f13d766
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/engines/slack.py
View File

@ -593,7 +593,7 @@ class SlackClient(object):
Run each of them through ``get_configured_target(('foo', f), 'pillar.get')`` and confirm a valid target Run each of them through ``get_configured_target(('foo', f), 'pillar.get')`` and confirm a valid target
''' '''
# Default to targetting all minions with a type of glob # Default to targeting all minions with a type of glob
null_target = {'target': '*', 'tgt_type': 'glob'} null_target = {'target': '*', 'tgt_type': 'glob'}
def check_cmd_against_group(cmd): def check_cmd_against_group(cmd):
@ -627,14 +627,12 @@ class SlackClient(object):
return checked return checked
return null_target return null_target
# emulate the yaml_out output formatter. It relies on a global __opts__ object which we can't
# obviously pass in
def format_return_text(self, data, function, **kwargs): # pylint: disable=unused-argument def format_return_text(self, data, function, **kwargs): # pylint: disable=unused-argument
''' '''
Print out YAML using the block mode Print out YAML using the block mode
''' '''
# emulate the yaml_out output formatter. It relies on a global __opts__ object which
# we can't obviously pass in
try: try:
# Format results from state runs with highstate output # Format results from state runs with highstate output
if function.startswith('state'): if function.startswith('state'):

2
salt/modules/consul.py
View File

@ -214,7 +214,7 @@ def get(consul_url=None, key=None, token=None, recurse=False, decode=False, raw=
if ret['res']: if ret['res']:
if decode: if decode:
for item in ret['data']: for item in ret['data']:
if item['Value'] != None: if item['Value'] is not None:
item['Value'] = base64.b64decode(item['Value']) item['Value'] = base64.b64decode(item['Value'])
else: else:
item['Value'] = "" item['Value'] = ""

2
salt/modules/lxc.py
View File

@ -4689,7 +4689,7 @@ def get_pid(name, path=None):
if name not in list_(limit='running', path=path): if name not in list_(limit='running', path=path):
raise CommandExecutionError('Container {0} is not running, can\'t determine PID'.format(name)) raise CommandExecutionError('Container {0} is not running, can\'t determine PID'.format(name))
info = __salt__['cmd.run']('lxc-info -n {0}'.format(name)).split("\n") info = __salt__['cmd.run']('lxc-info -n {0}'.format(name)).split("\n")
pid = [line.split(':')[1].strip() for line in info if re.match(r'\s*PID', line) != None][0] pid = [line.split(':')[1].strip() for line in info if re.match(r'\s*PID', line) is not None][0]
return pid return pid

2
salt/modules/win_lgpo.py
View File

@ -4337,7 +4337,7 @@ def _writeAdminTemplateRegPolFile(admtemplate_data,
adml_policy_resources=None, adml_policy_resources=None,
display_language='en-US', display_language='en-US',
registry_class='Machine'): registry_class='Machine'):
u''' r'''
helper function to prep/write adm template data to the Registry.pol file helper function to prep/write adm template data to the Registry.pol file
each file begins with REGFILE_SIGNATURE (u'\u5250\u6765') and each file begins with REGFILE_SIGNATURE (u'\u5250\u6765') and