fixes to appease new flake8 plugins

Author: chrislit

abydos/distance/_typo.py

@@ -279,6 +279,7 @@ def _get_char_coord(char, kb_array):
             for row in kb_array:  # pragma: no branch
                 if char in row:
                     return kb_array.index(row), row.index(char)
+            return -1, -1
 
         def _euclidean_keyboard_distance(char1, char2):
             row1, col1 = _get_char_coord(char1, _kb_array_for_char(char1))

abydos/phones/_phones.py

@@ -961,19 +961,8 @@ def cmp_features(feat1, feat2, weights=None):
 
     magnitude = sum(weights) if weights else len(_FEATURE_MASK)
 
-    featxor = feat1 ^ feat2
-    diffbits = 0
-    i = 0
-    while featxor:
-        if featxor & 0b1:
-            diffbits += weights[i] if weights else 1
-        featxor >>= 1
-        if featxor & 0b1:
-            diffbits += weights[i] if weights else 1
-        featxor >>= 1
-        i += 1
-    return 1 - (0 if not diffbits else (diffbits / (2 * magnitude)))
     """
+    # Alternate implementation
     diff_feats = 0
     i = 0
     while feat1 or feat2:
@@ -990,6 +979,19 @@ def cmp_features(feat1, feat2, weights=None):
     return 1 - (diff_feats / magnitude)
     """
 
+    featxor = feat1 ^ feat2
+    diffbits = 0
+    i = 0
+    while featxor:
+        if featxor & 0b1:
+            diffbits += weights[i] if weights else 1
+        featxor >>= 1
+        if featxor & 0b1:
+            diffbits += weights[i] if weights else 1
+        featxor >>= 1
+        i += 1
+    return 1 - (0 if not diffbits else (diffbits / (2 * magnitude)))
+
 
 if __name__ == '__main__':
     import doctest

abydos/util/_data.py

@@ -179,7 +179,7 @@ def _default_download_dir():
     """
     # Check if we are on GAE where we cannot write into filesystem.
     if 'APPENGINE_RUNTIME' in os.environ:  # pragma: no cover
-        return
+        return None
 
     # Check if we have sufficient permissions to install in a
     # variety of system-wide locations.

data/features/features_csv_to_dict.py

@@ -81,8 +81,8 @@ def binarize(num):
             return '10'
         elif num == '1':  # +
             return '01'
-        elif num == '2':  # ± (segmental) or copy from base (non-segmental)
-            return '11'
+        # '2' -> ± (segmental) or copy from base (non-segmental)
+        return '11'
 
     def init_termdicts():
         """Initialize the terms dict.