opendev/gerritlib
Code Issues Proposed changes

Return lists from listing functions

Browse Source 
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
This commit is contained in:
Clark Boylan 2020-03-27 14:17:17 -07:00
parent cfceeb50e0
commit 17380a3e71
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gerritlib/gerrit.py
View File

@ -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()