Apply suggestions from code review

Co-authored-by: Sander Roet <sanderroet@hotmail.com>

Author: dwhswenson

paths_cli/tests/wizard/test_core.py

@@ -48,4 +48,3 @@ def test_get_missing_object(length, expected):
     result = get_missing_object(wizard, dct, display_name='string',
                                 fallback_func=fallback)
     assert result == expected
-    pass

paths_cli/tests/wizard/test_load_from_ops.py

@@ -94,5 +94,3 @@ def test_load_from_ops(ops_file_fixture):
 
     assert isinstance(obj, NamedObj)
     assert obj.name == 'bar'
-
-    pass

paths_cli/wizard/core.py

@@ -13,12 +13,12 @@ def interpret_req(req):
         return str(min_)
 
     if min_ >= 1:
-        string += "at least " + str(min_)
+        string += f"at least {min_}"
 
     if max_ < float("inf"):
-        if string != "":
+        if string:
             string += " and "
-        string += "at most " + str(max_)
+        string += f"at most {max_}"
 
     return string
 
@@ -44,4 +44,3 @@ def inner(*args, **kwargs):
         return obj
     return inner
 
-

paths_cli/wizard/cvs.py

@@ -80,10 +80,10 @@ def _mdtraj_function_cv(wizard, cv_does_str, cv_user_prompt, func,
     kwargs = {kwarg_name: indices}
 
     summary = ("Here's what we'll create:\n"
-               "  Function: " + str(func.__name__) + "\n"
-               "     Atoms: " + " ".join([str(topology.mdtraj.atom(i))
-                                          for i in indices[0]]) + "\n"
-               "  Topology: " + repr(topology.mdtraj))
+               f"  Function: {func.__name__}\n"
+               f"     Atoms: {" ".join([str(topology.mdtraj.atom(i))
+                                        for i in indices[0]])} \n"
+               f"  Topology: {repr(topology.mdtraj))}"
     wizard.say(summary)
 
     return MDTrajFunctionCV(func, topology, period_min=period_min,

paths_cli/wizard/joke.py

@@ -36,15 +36,9 @@ def _joke4(name, obj_type):  # no-cov
                                        a_an_thing=a_an_thing)
 
 def name_joke(name, obj_type):  # no-cov
-    rnd = random.random()
-    if rnd < 0.25:
-        joke = _joke1
-    elif rnd < 0.50:
-        joke = _joke2
-    elif rnd < 0.65:
-        joke = _joke3
-    else:
-        joke = _joke4
+    jokes = [_joke1, _joke2, _joke3, _joke4]
+    weights = [5, 5, 3, 7]
+    joke = random.choices(jokes, weights=weights)[0]
     return joke(name, obj_type)
 
 if __name__ == "__main__":

paths_cli/wizard/load_from_ops.py

@@ -9,7 +9,7 @@ def list_items(wizard, user_input):
         store = getattr(storage, store_name)
         names = [obj for obj in store if obj.is_named]
         outstr = "\n".join(['* ' + obj.name for obj in names])
-        wizard.say("Here's what I found:\n\n" + outstr)
+        wizard.say(f"Here's what I found:\n\n{outstr})
 
     return list_items
 

paths_cli/wizard/tps.py

@@ -6,7 +6,7 @@
 from functools import partial
 
 def tps_network(wizard):
-    raise NotImplementedError("Still need to add other network choic")
+    raise NotImplementedError("Still need to add other network choices")
 
 
 def tps_scheme(wizard, network=None):

paths_cli/wizard/volumes.py

@@ -17,12 +17,12 @@ def _vol_intro(wizard, as_state):
 def _binary_func_volume(wizard, op):
     wizard.say("Let's make the first constituent volume:")
     vol1 = volumes(wizard)
-    wizard.say(f"The first volume is:\n{str(vol1)}")
+    wizard.say(f"The first volume is:\n{vol1}")
     wizard.say("Let's make the second constituent volume:")
     vol2 = volumes(wizard)
-    wizard.say(f"The second volume is:\n{str(vol2)}")
+    wizard.say(f"The second volume is:\n{vol2}")
     vol = op(vol1, vol2)
-    wizard.say(f"Created a volume:\n{str(vol)}")
+    wizard.say(f"Created a volume:\n{vol}")
     return vol
 
 def intersection_volume(wizard):
@@ -42,7 +42,7 @@ def negated_volume(wizard):
     wizard.say("Let's make the subvolume.")
     subvol = volumes(wizard)
     vol = ~subvol
-    wizard.say(f"Created a volume:\n{str(vol)}")
+    wizard.say(f"Created a volume:\n{vol}")
     return vol
 
 def cv_defined_volume(wizard):