Merge pull request #2264 from jeandet/master

Some refactoring, introduction of listify function.

1 files changed, 20 insertions, 0 deletions

diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index d03e5a2..b5a6318 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -473,6 +473,26 @@ def replace_if_different(dst, dst_tmp):
     else:
         os.unlink(dst_tmp)
 
+
+def listify(*args):
+    '''
+    Returns a list with all args embedded in a list if they are not of type list.
+    This function preserves order.
+    '''
+    if len(args) == 1:  # Special case with one single arg
+        return args[0] if type(args[0]) is list else [args[0]]
+    return [item if type(item) is list else [item] for item in args]
+
+
+def extract_as_list(dict_object, *keys, pop = False):
+    '''
+    Extracts all values from given dict_object and listifies them.
+    '''
+    if pop:
+        return listify(*[dict_object.pop(key, []) for key in keys])
+    return listify(*[dict_object.get(key, []) for key in keys])
+
+
 def typeslistify(item, types):
     '''
     Ensure that type(@item) is one of @types or a