From: Ross Burton <ross.burton@intel.com>
Date: Sun, 5 Jun 2016 21:52:42 +0000 (+0100)
Subject: lib/oe/package_manager: adapt for Python 3
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~25470
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=554719e3f65e468f89a96d4869766d3ff7a8012e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

lib/oe/package_manager: adapt for Python 3

string.rstrip() doesn't exist in Python 3, so use the .rstrip method on the
object itself instead.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 71e5b502e79..3b1d24fff29 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -638,8 +638,8 @@ class PackageManager(object, metaclass=ABCMeta):
     def construct_uris(self, uris, base_paths):
         def _append(arr1, arr2, sep='/'):
             res = []
-            narr1 = [string.rstrip(a, sep) for a in arr1]
-            narr2 = [string.lstrip(string.rstrip(a, sep), sep) for a in arr2]
+            narr1 = [a.rstrip(sep) for a in arr1]
+            narr2 = [a.rstrip(sep).lstrip(sep) for a in arr2]
             for a1 in narr1:
                 if arr2:
                     for a2 in narr2: