Use clean_kwargs method instead

This commit is contained in:
Mark Troyer 2018-07-05 13:56:02 -07:00
parent f7fa7f57c6
commit 65817ac74d
No known key found for this signature in database
GPG key ID: E842B48D27DA2F00

View file

@ -19,6 +19,7 @@ Module to provide redis functionality to Salt
from __future__ import absolute_import
from salt.ext.six.moves import zip
from salt.ext import six
from salt.utils import clean_kwargs
from datetime import datetime
# Import third party libs
@ -395,14 +396,7 @@ def hmset(key, **fieldsvals):
database = fieldsvals.pop('db', None)
password = fieldsvals.pop('password', None)
server = _connect(host, port, database, password)
# orchestration passes several private key/var pairs in that we don't want
# to set in redis.
redispairs = {}
for field, value in fieldsvals.iteritems():
if not field.startswith('__'):
redispairs[field] = value
return server.hmset(key, redispairs)
return server.hmset(key, clean_kwargs(**fieldsvals))
def hset(key, field, value, host=None, port=None, db=None, password=None):