From 17380a3e71d8191b631d6d0aaf329ff44b5bd39a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 27 Mar 2020 14:17:17 -0700 Subject: [PATCH] Return lists from listing functions We use filter to filter out entries when listing items like groups. This returns a list in python2 but an iterable in python3. Return a consistent list via forced coersion. Change-Id: Iad84f6f383fb85363f3ef51c4bd1da05b8069e43 --- gerritlib/gerrit.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gerritlib/gerrit.py b/gerritlib/gerrit.py index eb8e17a..c2ec072 100644 --- a/gerritlib/gerrit.py +++ b/gerritlib/gerrit.py @@ -299,7 +299,7 @@ class Gerrit(object): # separated by ' - ' sequence cmd += ' --description' out, err = self._ssh(cmd) - return filter(None, out.split('\n')) + return list(filter(None, out.split('\n'))) def listGroups(self, verbose=False): if verbose: @@ -307,7 +307,7 @@ class Gerrit(object): else: cmd = 'gerrit ls-groups' out, err = self._ssh(cmd) - return filter(None, out.split('\n')) + return list(filter(None, out.split('\n'))) def listGroup(self, group, verbose=False): if verbose: @@ -317,7 +317,7 @@ class Gerrit(object): # ensure group names with spaces are escaped and quoted group = "\"%s\"" % group.replace(' ', '\ ') out, err = self._ssh(' '.join([cmd, '-q', group])) - return filter(None, out.split('\n')) + return list(filter(None, out.split('\n'))) def listPlugins(self): plugins = self.getPlugins()