simplify method and reformat code to PEP8 style

Xuefeng-Zhu · Xuefeng-Zhu · commit 06ba8172c95d · 2015-05-14T15:51:03.000-05:00
diff --git a/trees/trie.py b/trees/trie.py
@@ -5,64 +5,74 @@
            start_with_prefix(prefix)
 """
 # HELPERS #
+
+
 def _get_child_branches(tr):
     return tr[1:]
 
+
 def _get_child_branch(tr, c):
+    """
+    Find matching branch with the character
+    """
     for branch in _get_child_branches(tr):
         if branch[0] == c:
             return branch
+
     return None
 
+
 def _retrive_branch(k, trie_list):
-    if k == "":
+    if not k:
         return None
     tr = trie_list
     for c in k:
         child_branch = _get_child_branch(tr, c)
         if not child_branch:
             return None
         tr = child_branch
+
     return tr
 
+
 def _is_trie_bucket(bucket):
     if len(bucket) != 2:
         return False
-    if type(bucket[1]) is tuple:
-        return True
+
+    return type(bucket[1]) is tuple
+
 
 def _get_bucket_key(bucket):
     if not _is_trie_bucket(bucket):
         return None
-    return bucket[1][0] 
+
+    return bucket[1][0]
 
 # HAS_KEY #
+
+
 def has_key(k, tr):
-    if k == "":
-        return None
-    key_tuple = _retrive_branch(k, tr)
-    if not key_tuple:
-        return False
-    return True
+    return _retrive_branch(k, tr) is not None
 
 # RETRIE_VAL
+
+
 def retrie_val(k, tr):
-    if k == "":
-        return None
     key_tuple = _retrive_branch(k, tr)
     if not key_tuple:
         return None
+
     return key_tuple[1]
 
 
 def insert_key(key, v, trie_list):
-    if key == "" or has_key(key, trie_list):
+    if not key or has_key(key, trie_list):
         return
 
     tr = trie_list
     for char in key:
         branch = _get_child_branch(tr, char)
-        if branch == None:
+        if not branch:
             new_branch = [char]
             tr.append(new_branch)
             tr = new_branch
@@ -137,7 +147,7 @@ def start_with_prefix(prefix, trie):
             Washington
             West Virginia
             Wisconsin
-            Wyoming"""    
+            Wyoming"""
     states_list = [w.strip().lower() for w in states.splitlines() if w]
     for state in states_list:
         insert_key(state, True, trie)
