Patchwork [bitbake-devel,1/2] data_smart: use a split/filter/rejoin for _remove

login
register
mail settings
Submitter Christopher Larson
Date Aug. 27, 2013, 11:27 p.m.
Message ID <1377646061-24208-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/56773/
State Accepted
Commit 1aa49226d5a2bac911feeb90e3d9f19529bc1a3e
Headers show

Comments

Christopher Larson - Aug. 27, 2013, 11:27 p.m.
From: Christopher Larson <chris_larson@mentor.com>

This is more idiomatic, and from the limited performance testing I did, is
faster as well. See https://gist.github.com/kergoth/6360248 for the naive
benchmark.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 lib/bb/data_smart.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Patch

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 3fb88a9..6229fbf 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -589,13 +589,9 @@  class DataSmart(MutableMapping):
         if expand and value:
             value = self.expand(value, None)
         if value and flag == "_content" and local_var and "_removeactive" in local_var:
-            for i in local_var["_removeactive"]:
-                if " " + i + " " in value:
-                    value = value.replace(" " + i + " ", " ")
-                if value.startswith(i + " "):
-                    value = value[len(i + " "):]
-                if value.endswith(" " + i):
-                    value = value[:-len(" " + i)]
+            filtered = filter(lambda v: v not in local_var["_removeactive"],
+                              value.split(" "))
+            value = " ".join(filtered)
         return value
 
     def delVarFlag(self, var, flag, **loginfo):