diff --git a/daemon.py b/daemon.py index 1d4994715..0817103a8 100644 --- a/daemon.py +++ b/daemon.py @@ -263,7 +263,7 @@ from utils import user_agent_domain from utils import isLocalNetworkAddress from utils import permitted_dir from utils import is_account_dir -from utils import getOccupationSkills +from utils import get_occupation_skills from utils import get_occupation_name from utils import set_occupation_name from utils import loadTranslationsFromFile @@ -9803,7 +9803,7 @@ class PubServer(BaseHTTPRequestHandler): accessKeys = \ self.server.keyShortcuts[nickname] actorSkillsList = \ - getOccupationSkills(actor_json) + get_occupation_skills(actor_json) skills = getSkillsFromList(actorSkillsList) city = getSpoofedCity(self.server.city, base_dir, @@ -9861,7 +9861,7 @@ class PubServer(BaseHTTPRequestHandler): else: if self._secure_mode(): actorSkillsList = \ - getOccupationSkills(actor_json) + get_occupation_skills(actor_json) skills = getSkillsFromList(actorSkillsList) msg = json.dumps(skills, ensure_ascii=False) diff --git a/skills.py b/skills.py index 18c920bb6..7b1c80ad5 100644 --- a/skills.py +++ b/skills.py @@ -17,7 +17,7 @@ from utils import get_full_domain from utils import getNicknameFromActor from utils import getDomainFromActor from utils import load_json -from utils import getOccupationSkills +from utils import get_occupation_skills from utils import set_occupation_skills_list from utils import acct_dir from utils import local_actor_url @@ -57,7 +57,7 @@ def getSkillsFromList(skillsList: []) -> {}: def actorSkillValue(actor_json: {}, skillName: str) -> int: """Returns The skill level from an actor """ - ocSkillsList = getOccupationSkills(actor_json) + ocSkillsList = get_occupation_skills(actor_json) skillsDict = getSkillsFromList(ocSkillsList) if not skillsDict: return 0 @@ -71,7 +71,7 @@ def noOfActorSkills(actor_json: {}) -> int: """Returns the number of skills that an actor has """ if actor_json.get('hasOccupation'): - skillsList = getOccupationSkills(actor_json) + skillsList = get_occupation_skills(actor_json) return len(skillsList) return 0 @@ -96,7 +96,7 @@ def setActorSkillLevel(actor_json: {}, }, 'skills': [] }] - ocSkillsList = getOccupationSkills(actor_json) + ocSkillsList = get_occupation_skills(actor_json) skillsDict = getSkillsFromList(ocSkillsList) if not skillsDict.get(skill): if len(skillsDict.items()) >= 32: @@ -139,7 +139,7 @@ def getSkills(base_dir: str, nickname: str, domain: str) -> []: if actor_json: if not actor_json.get('hasOccupation'): return None - ocSkillsList = getOccupationSkills(actor_json) + ocSkillsList = get_occupation_skills(actor_json) return getSkillsFromList(ocSkillsList) return None @@ -268,7 +268,7 @@ def sendSkillViaServer(base_dir: str, session, nickname: str, password: str, def actorHasSkill(actor_json: {}, skillName: str) -> bool: """Returns true if the given actor has the given skill """ - ocSkillsList = getOccupationSkills(actor_json) + ocSkillsList = get_occupation_skills(actor_json) for skillStr in ocSkillsList: if skillName + ':' in skillStr: return True diff --git a/utils.py b/utils.py index 53d7db1b1..764002692 100644 --- a/utils.py +++ b/utils.py @@ -2719,26 +2719,26 @@ def dmAllowedFromDomain(base_dir: str, return False -def getOccupationSkills(actor_json: {}) -> []: +def get_occupation_skills(actor_json: {}) -> []: """Returns the list of skills for an actor """ if 'hasOccupation' not in actor_json: return [] if not isinstance(actor_json['hasOccupation'], list): return [] - for occupationItem in actor_json['hasOccupation']: - if not isinstance(occupationItem, dict): + for occupation_item in actor_json['hasOccupation']: + if not isinstance(occupation_item, dict): continue - if not occupationItem.get('@type'): + if not occupation_item.get('@type'): continue - if not occupationItem['@type'] == 'Occupation': + if not occupation_item['@type'] == 'Occupation': continue - if not occupationItem.get('skills'): + if not occupation_item.get('skills'): continue - if isinstance(occupationItem['skills'], list): - return occupationItem['skills'] - elif isinstance(occupationItem['skills'], str): - return [occupationItem['skills']] + if isinstance(occupation_item['skills'], list): + return occupation_item['skills'] + elif isinstance(occupation_item['skills'], str): + return [occupation_item['skills']] break return []