From 4387e21ba4fdf73fadc1f0c15805cc392c9d7afc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 26 Dec 2021 18:50:59 +0000 Subject: [PATCH] Snake case --- skills.py | 4 ++-- utils.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/skills.py b/skills.py index c88a0490e..18c920bb6 100644 --- a/skills.py +++ b/skills.py @@ -18,7 +18,7 @@ from utils import getNicknameFromActor from utils import getDomainFromActor from utils import load_json from utils import getOccupationSkills -from utils import setOccupationSkillsList +from utils import set_occupation_skills_list from utils import acct_dir from utils import local_actor_url from utils import has_actor @@ -31,7 +31,7 @@ def setSkillsFromDict(actor_json: {}, skillsDict: {}) -> []: skillsList = [] for name, value in skillsDict.items(): skillsList.append(name + ':' + str(value)) - setOccupationSkillsList(actor_json, skillsList) + set_occupation_skills_list(actor_json, skillsList) return skillsList diff --git a/utils.py b/utils.py index 2cdfdfeab..91fc126d1 100644 --- a/utils.py +++ b/utils.py @@ -2785,7 +2785,7 @@ def setOccupationName(actor_json: {}, name: str) -> bool: return False -def setOccupationSkillsList(actor_json: {}, skillsList: []) -> bool: +def set_occupation_skills_list(actor_json: {}, skills_list: []) -> bool: """Sets the occupation skills for an actor """ if 'hasOccupation' not in actor_json: @@ -2793,24 +2793,24 @@ def setOccupationSkillsList(actor_json: {}, skillsList: []) -> bool: if not isinstance(actor_json['hasOccupation'], list): return False for index in range(len(actor_json['hasOccupation'])): - occupationItem = actor_json['hasOccupation'][index] - if not isinstance(occupationItem, dict): + occupation_item = actor_json['hasOccupation'][index] + if not isinstance(occupation_item, dict): continue - if not occupationItem.get('@type'): + if not occupation_item.get('@type'): continue - if occupationItem['@type'] != 'Occupation': + if occupation_item['@type'] != 'Occupation': continue - occupationItem['skills'] = skillsList + occupation_item['skills'] = skills_list return True return False -def is_account_dir(dirName: str) -> bool: +def is_account_dir(dir_name: str) -> bool: """Is the given directory an account within /accounts ? """ - if '@' not in dirName: + if '@' not in dir_name: return False - if 'inbox@' in dirName or 'news@' in dirName: + if 'inbox@' in dir_name or 'news@' in dir_name: return False return True