python/nested-lookup
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issue where get_all_keys or _get_occurence choked on strings. (#9)

Browse source
This commit is contained in:
jpavlav 2018-11-01 10:28:55 -05:00 • committed by Russell Ballestrini
parent 08967c817b
commit 7513169ab4
2 changed files with 51 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
nested_lookup/nested_lookup.py
View file

@ -49,16 +49,17 @@ def get_all_keys(dictionary):
result_list = []
def recrusion(dictionary):
for key, value in iteritems(dictionary):
if isinstance(value, dict):
result_list.append(key)
recrusion(dictionary=value)
elif isinstance(value, list):
result_list.append(key)
for list_items in value:
recrusion(dictionary=list_items)
else:
result_list.append(key)
if hasattr(dictionary, 'items'):
for key, value in iteritems(dictionary):
if isinstance(value, dict):
result_list.append(key)
recrusion(dictionary=value)
elif isinstance(value, list):
result_list.append(key)
for list_items in value:
recrusion(dictionary=list_items)
else:
result_list.append(key)
recrusion(dictionary=dictionary)
return result_list
@ -104,16 +105,17 @@ def _get_occurrence(dictionary, item, keyword):
occurrence = [0]
def recrusion(dictionary):
if item == 'key':
occurrence[0] += 1 if dictionary.get(keyword) else 0
elif keyword in dictionary.values():
occurrence[0] += dictionary.values().count(keyword)
for key, value in iteritems(dictionary):
if isinstance(value, dict):
recrusion(dictionary=value)
elif isinstance(value, list):
for list_items in value:
recrusion(dictionary=list_items)
if hasattr(dictionary, 'items'):
if item == 'key':
occurrence[0] += 1 if dictionary.get(keyword) else 0
elif keyword in dictionary.values():
occurrence[0] += dictionary.values().count(keyword)
for key, value in iteritems(dictionary):
if isinstance(value, dict):
recrusion(dictionary=value)
elif isinstance(value, list):
for list_items in value:
recrusion(dictionary=list_items)
recrusion(dictionary=dictionary)
return occurrence[0]