saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Python 3 incompatibilities

Browse source
This commit is contained in:
Megan Kearl 2015-11-18 20:10:36 -06:00
parent 5920f2a311
commit f6c30a78ea
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/beacons/__init__.py
View file

@ -12,6 +12,7 @@ import re
import salt.loader
import salt.utils
import salt.utils.minion
from salt.ext.six.moves import map
log = logging.getLogger(__name__)
@ -47,7 +48,7 @@ class Beacon(object):
current_beacon_config = None
if isinstance(config[mod], list):
current_beacon_config = {}
map(current_beacon_config.update, config[mod])
list(map(current_beacon_config.update, config[mod]))
elif isinstance(config[mod], dict):
salt.utils.warn_until(
'Boron',
@ -55,7 +56,7 @@ class Beacon(object):
)
current_beacon_config = config[mod]
if current_beacon_config.has_key('enabled'):
if 'enabled' in current_beacon_config:
if not current_beacon_config['enabled']:
log.trace('Beacon {0} disabled'.format(mod))
continue
@ -146,7 +147,7 @@ class Beacon(object):
Return the index of a labeled config item in the beacon config, -1 if the index is not found
'''
indexes = [index for index, item in enumerate(beacon_config) if item.has_key(label)]
indexes = [index for index, item in enumerate(beacon_config) if label in item]
if len(indexes) < 1:
return -1
else:

3
salt/modules/beacons.py
View file

@ -13,6 +13,7 @@ import os
import yaml
import salt.utils
from salt.ext.six.moves import map
import logging
log = logging.getLogger(__name__)
@ -367,7 +368,7 @@ def disable(**kwargs):
def _get_beacon_config_dict(beacon_config):
beacon_config_dict = {}
if isinstance(beacon_config, list):
map(beacon_config_dict.update, beacon_config)
list(map(beacon_config_dict.update, beacon_config))
else:
beacon_config_dict = beacon_config