More cleanup, yey!

[python_utils.git] / dict_utils.py

diff --git a/dict_utils.py b/dict_utils.py
index 1f211fee87c9f9841a50d7be93a6a88300343673..ecd23fda0fe0f4624a27ca6a8971dd068ce2958e 100644 (file)
--- a/dict_utils.py
+++ b/dict_utils.py
@@ -1,14 +1,17 @@
 #!/usr/bin/env python3
 
+"""Helper functions for dealing with dictionaries."""
+
 from itertools import islice
 from typing import Any, Callable, Dict, Iterator, List, Tuple
 
+
 def init_or_inc(
     d: Dict[Any, Any],
     key: Any,
     *,
     init_value: Any = 1,
-    inc_function: Callable[..., Any] = lambda x: x + 1
+    inc_function: Callable[..., Any] = lambda x: x + 1,
 ) -> bool:
     """
     Initialize a dict value (if it doesn't exist) or increments it (using the
@@ -37,14 +40,16 @@ def shard(d: Dict[Any, Any], size: int) -> Iterator[Dict[Any, Any]]:
     """
     Shards a dict into N subdicts which, together, contain all keys/values
     from the original unsharded dict.
+
     """
     items = d.items()
     for x in range(0, len(d), size):
-        yield {key: value for (key, value) in islice(items, x, x + size)}
+        yield dict(islice(items, x, x + size))
 
 
-def coalesce_by_creating_list(key, new_value, old_value):
+def coalesce_by_creating_list(_, new_value, old_value):
     from list_utils import flatten
+
     return flatten([new_value, old_value])
 
 
@@ -52,11 +57,11 @@ def coalesce_by_creating_set(key, new_value, old_value):
     return set(coalesce_by_creating_list(key, new_value, old_value))
 
 
-def coalesce_last_write_wins(key, new_value, old_value):
+def coalesce_last_write_wins(_, new_value, discarded_old_value):
     return new_value
 
 
-def coalesce_first_write_wins(key, new_value, old_value):
+def coalesce_first_write_wins(_, discarded_new_value, old_value):
     return old_value
 
 
@@ -65,9 +70,9 @@ def raise_on_duplicated_keys(key, new_value, old_value):
 
 
 def coalesce(
-        inputs: Iterator[Dict[Any, Any]],
-        *,
-        aggregation_function: Callable[[Any, Any], Any] = coalesce_by_creating_list
+    inputs: Iterator[Dict[Any, Any]],
+    *,
+    aggregation_function: Callable[[Any, Any, Any], Any] = coalesce_by_creating_list,
 ) -> Dict[Any, Any]:
     """Merge N dicts into one dict containing the union of all keys /
     values in the input dicts.  When keys collide, apply the
@@ -220,7 +225,7 @@ def dict_to_key_value_lists(d: Dict[Any, Any]) -> Tuple[List[Any], List[Any]]:
     ['scott', '555-1212', '123 main st.', '12345']
 
     """
-    r = ([], [])
+    r: Tuple[List[Any], List[Any]] = ([], [])
     for (k, v) in d.items():
         r[0].append(k)
         r[1].append(v)
@@ -229,4 +234,5 @@ def dict_to_key_value_lists(d: Dict[Any, Any]) -> Tuple[List[Any], List[Any]]:
 
 if __name__ == '__main__':
     import doctest
+
     doctest.testmod()