Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c35c465 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make words() work on a list of non-strings" am: 6086c5ce am: 780964e4 

Original change: https://android-review.googlesource.com/c/platform/build/+/2424056



Change-Id: Iac819fd11cbc461d6987931d9f6143fa378bc61f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26de0a35 780964e4

core/product_config.rbc

+3 −0
Original line number Diff line number Diff line
@@ -462,6 +462,9 @@ def _addsuffix(suffix, string_or_list): 


def __words(string_or_list):

    if type(string_or_list) == "list":

        for x in string_or_list:

            if type(x) != "string":

                return string_or_list

        string_or_list = " ".join(string_or_list)

    return _mkstrip(string_or_list).split()

tests/run.rbc

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ assert_eq("", rblf.mkstrip(" \n \t ")) 
assert_eq("a b c", rblf.mkstrip("  a b   \n  c \t"))

assert_eq("1", rblf.mkstrip("1 "))



assert_eq(["a", "b"], rblf.words("a b"))

assert_eq(["a", "b", "c"], rblf.words(["a b", "c"]))

# 1-tuple like we use in product variables

assert_eq(["a b", ("c",)], rblf.words(["a b", ("c",)]))



assert_eq("b1 b2", rblf.mksubst("a", "b", "a1 a2"))

assert_eq(["b1", "x2"], rblf.mksubst("a", "b", ["a1", "x2"]))