[oe-commits] [openembedded-core] 02/02: lib/oe/package_manager: adapt for Python 3

git at git.openembedded.org git at git.openembedded.org
Sun Jun 5 22:41:18 UTC 2016


rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 554719e3f65e468f89a96d4869766d3ff7a8012e
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Sun Jun 5 22:52:42 2016 +0100

    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/package_manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 71e5b50..3b1d24f 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list