Improved KeyError(s) message.

This commit is contained in:
Fabio Caccamo 2020-09-10 19:06:43 +02:00
parent 4d6c43db28
commit b8d2e72cda
3 changed files with 6 additions and 6 deletions

View File

@ -6,6 +6,6 @@ def move(d, key_src, key_dest, overwrite=True):
return return
if key_dest in d and not overwrite: if key_dest in d and not overwrite:
raise KeyError( raise KeyError(
"'{}' already in target dict and `overwrite` is disabled.".format(key_dest) 'Invalid key: "{}", key already in target dict '
) 'and `overwrite` is disabled.'.format(key_dest))
d[key_dest] = d.pop(key_src) d[key_dest] = d.pop(key_src)

View File

@ -36,7 +36,7 @@ class KeylistDict(dict):
elif type_util.is_list(parent): elif type_util.is_list(parent):
del parent[key] del parent[key]
return return
raise KeyError(keys) raise KeyError('Invalid keys: "{}"'.format(keys))
def __getitem__(self, key): def __getitem__(self, key):
if type_util.is_list_or_tuple(key): if type_util.is_list_or_tuple(key):
@ -49,7 +49,7 @@ class KeylistDict(dict):
return parent[key] return parent[key]
elif type_util.is_list(parent): elif type_util.is_list(parent):
return parent[key] return parent[key]
raise KeyError(keys) raise KeyError('Invalid keys: "{}"'.format(keys))
def __setitem__(self, key, value): def __setitem__(self, key, value):
if type_util.is_list_or_tuple(key): if type_util.is_list_or_tuple(key):
@ -86,7 +86,7 @@ class KeylistDict(dict):
return parent.pop(key) return parent.pop(key)
if args: if args:
return args[0] return args[0]
raise KeyError raise KeyError('Invalid keys: "{}"'.format(keys))
def set(self, key, value): def set(self, key, value):
self[key] = value self[key] = value

View File

@ -16,7 +16,7 @@ def _get_item_key_and_value(item, key):
return (index, item[index], ) return (index, item[index], )
elif type_util.is_dict(item): elif type_util.is_dict(item):
return (key, item[key], ) return (key, item[key], )
raise KeyError(key) raise KeyError('Invalid key: "{}"'.format(key))
def _get_or_new_item_value(item, key, subkey): def _get_or_new_item_value(item, key, subkey):