From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Thu, 21 Nov 2019 14:36:47 +0000 (+0100)
Subject: packaging: fix syntax for py3 compat
X-Git-Tag: 1.1.0~189^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c13a5aaddb6a0bb164b770dce9e4179700d1722;p=teuthology.git

packaging: fix syntax for py3 compat

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

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 3230463e..50763f02 100644
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -657,7 +657,7 @@ class GitbuilderProject(object):
 
         :returns: A string URI. Ex: ref/master
         """
-        ref_name, ref_val = self._choose_reference().items()[0]
+        ref_name, ref_val = next(iter(self._choose_reference().items()))
         if ref_name == 'sha1':
             return 'sha1/%s' % ref_val
         else:
@@ -691,7 +691,7 @@ class GitbuilderProject(object):
             names = ('ref', 'tag', 'branch', 'sha1')
             vars = (ref, tag, branch, sha1)
             # filter(None,) filters for truth
-            if len(filter(None, vars)) > 1:
+            if sum(1 for _ in vars if _) > 1:
                 log.warning(
                     "More than one of ref, tag, branch, or sha1 supplied; "
                     "using %s",
@@ -880,7 +880,7 @@ class ShamanProject(GitbuilderProject):
         req_obj['project'] = self.project
         req_obj['flavor'] = flavor
         req_obj['distros'] = '%s/%s' % (self.distro, self.arch)
-        ref_name, ref_val = self._choose_reference().items()[0]
+        ref_name, ref_val = list(self._choose_reference().items())[0]
         if ref_name == 'tag':
             req_obj['sha1'] = self._sha1 = self._tag_to_sha1()
         elif ref_name == 'sha1':