TR suggestions

Author: gahjelle

python-first/chart.py

@@ -7,7 +7,6 @@
 
 import matplotlib.pyplot as plt
 
-
 TIMEIT_TIMES = 1000  # Increase number for smoother lines
 LIST_SIZE = 500
 POSITION_INCREMENT = 10
@@ -18,13 +17,13 @@ def build_list(size, fill, value, at_position):
 
 
 def find_match_loop(iterable):
-    for val in iterable:
-        if val["population"] > 50:
-            return val
+    for value in iterable:
+        if value["population"] > 50:
+            return value
 
 
 def find_match_gen(iterable):
-    return next(val for val in iterable if val["population"] > 50)
+    return next(value for value in iterable if value["population"] > 50)
 
 
 looping_times = []
@@ -33,7 +32,7 @@ def find_match_gen(iterable):
 
 for position in range(0, LIST_SIZE, POSITION_INCREMENT):
     print(
-        f"Progress {position/LIST_SIZE:.0%}",
+        f"Progress {position / LIST_SIZE:.0%}",
         end=f"{3 * ' '}\r",  # Clear previous characters and reset cursor
     )
 

python-first/chart_gen_loop_in.py

@@ -22,14 +22,16 @@ def build_list(size, fill, value, at_position):
 
 
 def find_match_loop(list_to_search, item_to_find):
-    for val in list_to_search:
-        if val == item_to_find:
-            return val
+    for value in list_to_search:
+        if value == item_to_find:
+            return value
     return None
 
 
 def find_match_gen(list_to_search, item_to_find):
-    return next((val for val in list_to_search if val == item_to_find), None)
+    return next(
+        (value for value in list_to_search if value == item_to_find), None
+    )
 
 
 def find_match_in(list_to_search, item_to_find):
@@ -39,7 +41,7 @@ def find_match_in(list_to_search, item_to_find):
 
 for position in range(0, LIST_SIZE, POSITION_INCREMENT):
     print(
-        f"Progress {position/LIST_SIZE:.0%}",
+        f"Progress {position / LIST_SIZE:.0%}",
         end=f"{3 * ' '}\r",  # Clear previous characters and resets cursor
     )
 

python-first/from_file.py

@@ -2,10 +2,10 @@
 
 value = "Florina"
 
-with open(Path("names.txt"), mode="r", encoding="utf-8") as f:
-    while value not in (line := f.readline()) and line != "":
+with Path("names.txt").open(mode="r", encoding="utf-8") as f:
+    while (line := f.readline()) and value not in line:
         pass
-    if line != "":
+    if line:
         print(f"Found: {line.strip()}")
     else:
         print("Not found")

python-first/get_first.py

@@ -4,20 +4,22 @@
 def get_first(iterable, value=None, key=None, default=None):
     match value is None, callable(key):
         case (True, True):
-            gen = (val for val in iterable if key(val))
+            gen = (elem for elem in iterable if key(elem))
         case (False, True):
-            gen = (val for val in iterable if key(val) == value)
+            gen = (elem for elem in iterable if key(elem) == value)
         case (True, False):
-            gen = (val for val in iterable if val)
+            gen = (elem for elem in iterable if elem)
         case (False, False):
-            gen = (val for val in iterable if val == value)
+            gen = (elem for elem in iterable if elem == value)
 
     return next(gen, default)
 
 
 if __name__ == "__main__":
-    target_match = {"country": "Norway", "population": 5311916}
-    print(get_first(countries, target_match))
+    print(get_first(countries))
+
+    target_match = {"country": "Norway", "population": 5_311_916}
+    print(get_first(countries, value=target_match))
 
     def match_scotland(data):
         return data["country"] == "Scotland"

python-first/get_first_alt.py

@@ -1,20 +1,22 @@
 from test_fixtures import countries
 
 
-def find_match_gen(iterable, key=None, default=None):
+def get_first(iterable, default=None, key=None):
     if callable(key):
-        gen = (val for val in iterable if key(val))
+        gen = (elem for elem in iterable if key(elem))
     else:
-        gen = (val for val in iterable if val)
+        gen = (elem for elem in iterable if elem)
 
     return next(gen, default)
 
 
 if __name__ == "__main__":
-    target_match = {"country": "Norway", "population": 5311916}
-    print(find_match_gen(countries, target_match))
+    print(get_first(countries))
+
+    target_match = {"country": "Norway", "population": 5_311_916}
+    print(get_first(countries, key=lambda elem: elem == target_match))
 
     def match_scotland(data):
         return data["country"] == "Scotland"
 
-    print(find_match_gen(countries, key=match_scotland))
+    print(get_first(countries, key=match_scotland))

python-first/get_first_loop.py

@@ -2,24 +2,26 @@
 
 
 def get_first_loop_no_key(iterable, value=None, default=None):
-    for val in iterable:
-        if (value is None and val) or (value is not None and val == value):
-            return val
+    for elem in iterable:
+        if (value is None and elem) or (value is not None and elem == value):
+            return elem
     return default
 
 
 def get_first_loop(iterable, value=None, key=None, default=None):
-    for val in iterable:
-        _val = key(val) if callable(key) else val
+    for elem in iterable:
+        _elem = key(elem) if callable(key) else elem
 
-        if (value is None and _val) or (value is not None and _val == value):
-            return val
+        if (value is None and _elem) or (value is not None and _elem == value):
+            return elem
     return default
 
 
 if __name__ == "__main__":
-    target_match = {"country": "Puerto Rico", "population": 3195153}
-    print(get_first_loop(countries, target_match))
+    print(get_first_loop(countries))
+
+    target_match = {"country": "Dominican Republic", "population": 10_627_165}
+    print(get_first_loop(countries, value=target_match))
 
     def match_scotland(data):
         return data["country"] == "Scotland"