Snake case

speaker.py

@@ -17,7 +17,7 @@ from utils import is_reply
 from utils import camel_case_split
 from utils import get_domain_from_actor
 from utils import getNicknameFromActor
-from utils import getGenderFromBio
+from utils import get_gender_from_bio
 from utils import get_display_name
 from utils import remove_html
 from utils import load_json
@@ -476,7 +476,7 @@ def _postToSpeakerJson(base_dir: str, http_prefix: str,
     speakerName = _removeEmojiFromText(speakerName)
     speakerName = speakerName.replace('_', ' ')
     speakerName = camel_case_split(speakerName)
-    gender = getGenderFromBio(base_dir, post_json_object['actor'],
+    gender = get_gender_from_bio(base_dir, post_json_object['actor'],
                                  person_cache, translate)
     if announcingActor:
         announcedNickname = getNicknameFromActor(announcingActor)

utils.py

@@ -915,32 +915,32 @@ def get_display_name(base_dir: str, actor: str, person_cache: {}) -> str:
         actor = actor.split('/statuses/')[0]
     if not person_cache.get(actor):
         return None
-    nameFound = None
+    name_found = None
     if person_cache[actor].get('actor'):
         if person_cache[actor]['actor'].get('name'):
-            nameFound = person_cache[actor]['actor']['name']
+            name_found = person_cache[actor]['actor']['name']
     else:
         # Try to obtain from the cached actors
-        cachedActorFilename = \
+        cached_actor_filename = \
             base_dir + '/cache/actors/' + (actor.replace('/', '#')) + '.json'
-        if os.path.isfile(cachedActorFilename):
+        if os.path.isfile(cached_actor_filename):
-            actor_json = load_json(cachedActorFilename, 1)
+            actor_json = load_json(cached_actor_filename, 1)
             if actor_json:
                 if actor_json.get('name'):
-                    nameFound = actor_json['name']
+                    name_found = actor_json['name']
-    if nameFound:
+    if name_found:
-        if dangerous_markup(nameFound, False):
+        if dangerous_markup(name_found, False):
-            nameFound = "*ADVERSARY*"
+            name_found = "*ADVERSARY*"
-    return nameFound
+    return name_found
 
 
-def _genderFromString(translate: {}, text: str) -> str:
+def _gender_from_string(translate: {}, text: str) -> str:
     """Given some text, does it contain a gender description?
     """
     gender = None
     if not text:
         return None
-    textOrig = text
+    text_orig = text
     text = text.lower()
     if translate['He/Him'].lower() in text or \
        translate['boy'].lower() in text:
@@ -953,12 +953,12 @@ def _genderFromString(translate: {}, text: str) -> str:
     elif 'her' in text or 'she' in text or \
          'fem' in text or 'woman' in text:
         gender = 'She/Her'
-    elif 'man' in text or 'He' in textOrig:
+    elif 'man' in text or 'He' in text_orig:
         gender = 'He/Him'
     return gender
 
 
-def getGenderFromBio(base_dir: str, actor: str, person_cache: {},
+def get_gender_from_bio(base_dir: str, actor: str, person_cache: {},
                         translate: {}) -> str:
     """Tries to ascertain gender from bio description
     This is for use by text-to-speech for pitch setting
@@ -1009,7 +1009,7 @@ def getGenderFromBio(base_dir: str, actor: str, person_cache: {},
                         continue
                     if not tag.get('name') or not tag.get('value'):
                         continue
-                    gender = _genderFromString(translate, tag['value'])
+                    gender = _gender_from_string(translate, tag['value'])
                     if gender:
                         return gender
     # if not then use the bio
@@ -1017,7 +1017,7 @@ def getGenderFromBio(base_dir: str, actor: str, person_cache: {},
         bioFound = actor_json['summary']
     if not bioFound:
         return defaultGender
-    gender = _genderFromString(translate, bioFound)
+    gender = _gender_from_string(translate, bioFound)
     if not gender:
         gender = defaultGender
     return gender