From: Ross Burton Date: Sun, 5 Jun 2016 21:52:42 +0000 (+0100) Subject: lib/oe/package_manager: adapt for Python 3 X-Git-Tag: uninative-1.3~763 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=554719e3f65e468f89a96d4869766d3ff7a8012e;p=openembedded-core.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 Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 71e5b502e7..3b1d24fff2 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: