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 import

Browse source
This commit is contained in:
Mike Place 2016-08-17 19:10:29 +09:00
parent f16a30786b
commit 253662541a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/consul.py
View file

@ -12,7 +12,7 @@ from __future__ import absolute_import
# Import 3rd-party libs
# pylint: disable=import-error,no-name-in-module,redefined-builtin
from salt.ext.six.moves.urllib.parse import urljoin as _urljoin
from salt.ext.six import iteritems
import salt.ext.six
import salt.ext.six.moves.http_client
# pylint: enable=import-error,no-name-in-module
@ -975,7 +975,7 @@ def agent_service_register(consul_url=None, **kwargs):
return ret
lc_kwargs = dict()
for k, v in iteritems(kwargs):
for k, v in salt.ext.six.iteritems(kwargs):
lc_kwargs[k.lower()] = v
if 'name' in lc_kwargs:
@ -1003,7 +1003,7 @@ def agent_service_register(consul_url=None, **kwargs):
if 'check' in lc_kwargs:
dd = dict()
for k, v in iteritems(lc_kwargs['check']):
for k, v in salt.ext.six.iteritems(lc_kwargs['check']):
dd[k.lower()] = v
interval_required = False
check_dd = dict()