task/install: py3 compat

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py
index 1e6fd1bc64302fdf21a2baf21a9d37d6262343ae..dac97d4928536abf432c77f38c3cbd672a7af3ae 100644 (file)
--- a/teuthology/task/install/__init__.py
+++ b/teuthology/task/install/__init__.py
@@ -155,8 +155,8 @@ def get_package_list(ctx, config):
     rpms = config.get('packages', dict()).get('rpm', default_rpms)
     # Optionally include or exclude debug packages
     if not debug:
-        debs = filter(lambda p: not p.endswith('-dbg'), debs)
-        rpms = filter(lambda p: not p.endswith('-debuginfo'), rpms)
+        debs = [p for p in debs if not p.endswith('-dbg')]
+        rpms = [p for p in rpms if not p.endswith('-debuginfo')]
 
     def exclude(pkgs, exclude_list):
         return list(pkg for pkg in pkgs if pkg not in exclude_list)
@@ -275,7 +275,8 @@ def upgrade_remote_to_config(ctx, config):
             if not remotes_dict:
                 # This is a regular config argument, not a role
                 continue
-            remote = remotes_dict.keys()[0]
+            # take any remote in the dict
+            remote = next(iter(remotes_dict))
             if remote in remotes:
                 log.warn('remote %s came up twice (role %s)', remote, role)
                 continue

diff --git a/teuthology/test/task/test_install.py b/teuthology/test/task/test_install.py
index 13892957ad89996f94f46e1b08764a0dc14731af..0334d685e8794d513b8a915a579a5a9f068d6db6 100644 (file)
--- a/teuthology/test/task/test_install.py
+++ b/teuthology/test/task/test_install.py
@@ -16,14 +16,10 @@ class TestInstall(object):
         )
         pkgs = yaml.safe_load(open(path))[project]
         if not debug:
-            pkgs['deb'] = filter(
-                lambda p: not p.endswith('-dbg'),
-                pkgs['deb']
-            )
-            pkgs['rpm'] = filter(
-                lambda p: not p.endswith('-debuginfo'),
-                pkgs['rpm']
-            )
+            pkgs['deb'] = [p for p in pkgs['deb']
+                                        if not p.endswith('-dbg')]
+            pkgs['rpm'] = [p for p in pkgs['rpm']
+                                        if not p.endswith('-debuginfo')]
         return pkgs
 
     def test_get_package_list_debug(self):