bt2/setup.py.in: improve legibility of our_get_config_vars a bit
authorSimon Marchi <simon.marchi@efficios.com>
Thu, 8 Feb 2024 19:25:32 +0000 (14:25 -0500)
committerSimon Marchi <simon.marchi@efficios.com>
Fri, 9 Feb 2024 15:36:29 +0000 (10:36 -0500)
This is a bit subjective, but avoid early returns / continue.  I like
early returns when there is clearly one "happy" of "main" path in a
function, for instance for error handling or returning early because a
function is a no-op.  But when handling different significant cases, I
prefer an explicit if/else.  It makes the different code paths stand
out visually.

Change-Id: I484eb4ec7187ce3c889507e31349c3b4461f3fc7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11764

src/bindings/python/bt2/setup.py.in

index cadefb728b10569ffc1297d85027a582324cc9a3..e256e42ed75a6f8cd6ba849b991925180339e592 100644 (file)
@@ -93,21 +93,22 @@ def our_get_config_vars(*args):
     }
 
     if len(args) == 0:
+        # Return a dict with all config vars.
         all_config_vars = original_get_config_vars()
         for name in overridden_config_vars:
             all_config_vars[name] = overridden_config_vars[name]
-        return all_config_vars
-
-    subset_config_vars = []
-    for name in args:
-        if name not in overridden_config_vars:
-            [var] = original_get_config_vars(name)
-            subset_config_vars.append(var)
-            continue
-
-        subset_config_vars.append(overridden_config_vars[name])
 
-    return subset_config_vars
+        return all_config_vars
+    else:
+        # Return a list with the requested config vars.
+        subset_config_vars = []
+        for name in args:
+            if name in overridden_config_vars:
+                subset_config_vars.append(overridden_config_vars[name])
+            else:
+                subset_config_vars.append(original_get_config_vars(name)[0])
+
+        return subset_config_vars
 
 
 sysconfig.get_config_vars = our_get_config_vars
This page took 0.025271 seconds and 4 git commands to generate.