code style reformatting using black

This commit is contained in:
Goffi 2018-06-27 20:14:46 +02:00
commit 744cb0c503

View file

@ -18,10 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
""" tools common to backend and frontends """
# FIXME: json may be more appropriate than manual serialising like done here
#  FIXME: json may be more appropriate than manual serialising like done here
from sat.core import exceptions
def dict2iter(name, dict_, pop=False):
"""iterate into a list serialised in a dict
@ -36,24 +37,25 @@ def dict2iter(name, dict_, pop=False):
@return iter: iterate through the deserialised list
"""
if pop:
get=lambda d,k: d.pop(k)
get = lambda d, k: d.pop(k)
else:
get=lambda d,k: d[k]
get = lambda d, k: d[k]
try:
yield get(dict_,name)
yield get(dict_, name)
except KeyError:
return
else:
idx = 1
while True:
try:
yield get(dict_,u'{}#{}'.format(name, idx))
yield get(dict_, u"{}#{}".format(name, idx))
except KeyError:
return
else:
idx += 1
def dict2iterdict(name, dict_, extra_keys, pop=False):
"""like dict2iter but yield dictionaries
@ -61,17 +63,20 @@ def dict2iterdict(name, dict_, extra_keys, pop=False):
e.g. dict2iterdict(comments, mb_data, ('node', 'service')) will yield dicts like:
{u'comments': u'value1', u'node': u'value2', u'service': u'value3'}
"""
# FIXME: this format seem overcomplicated, it may be more appropriate to use json here
#  FIXME: this format seem overcomplicated, it may be more appropriate to use json here
if pop:
get=lambda d,k: d.pop(k)
get = lambda d, k: d.pop(k)
else:
get=lambda d,k: d[k]
get = lambda d, k: d[k]
for idx, main_value in enumerate(dict2iter(name, dict_, pop=pop)):
ret = {name: main_value}
for k in extra_keys:
ret[k] = get(dict_, u'{}{}_{}'.format(name, (u'#' + unicode(idx)) if idx else u'', k))
ret[k] = get(
dict_, u"{}{}_{}".format(name, (u"#" + unicode(idx)) if idx else u"", k)
)
yield ret
def iter2dict(name, iter_, dict_=None, check_conflict=True):
"""Fill a dict with values from an iterable
@ -92,13 +97,14 @@ def iter2dict(name, iter_, dict_=None, check_conflict=True):
if idx == 0:
key = name
else:
key = u'{}#{}'.format(name, idx)
key = u"{}#{}".format(name, idx)
if check_conflict and key in dict_:
raise exceptions.ConflictError
dict_[key] = value
return dict
def getSubDict(name, dict_, sep=u'_'):
def getSubDict(name, dict_, sep=u"_"):
"""get a sub dictionary from a serialised dictionary
look for keys starting with name, and create a dict with it
@ -109,7 +115,7 @@ def getSubDict(name, dict_, sep=u'_'):
@param sep(unicode): separator used between name and subkey
@return iter: iterate through the deserialised items
"""
for k,v in dict_.iteritems():
for k, v in dict_.iteritems():
if k.startswith(name):
if k == name:
yield None, v
@ -117,4 +123,4 @@ def getSubDict(name, dict_, sep=u'_'):
if k[len(name)] != sep:
continue
else:
yield k[len(name)+1:], v
yield k[len(name) + 1 :], v