From f8be56efdc00584c37ba715162e15cf434cc6475 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 1 Sep 2016 10:07:26 -0700 Subject: [PATCH 1/2] Fix type, clean up doPrintGroupMembers --- src/gam.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gam.py b/src/gam.py index 621aa237..f91fd39e 100755 --- a/src/gam.py +++ b/src/gam.py @@ -9304,8 +9304,8 @@ def doPrintGroupMembers(): print u'ERROR: %s is not a valid argument for "gam print group-members"' % sys.argv[i] sys.exit(2) if not groups_to_get: - grous_to_get = callGAPIpages(cd.groups(), u'list', u'groups', message_attribute=u'email', - customer=customer, domain=usedomain, userKey=usemember, fields=u'nextPageToken,groups(email)') + groups_to_get = callGAPIpages(cd.groups(), u'list', u'groups', message_attribute=u'email', + customer=customer, domain=usedomain, userKey=usemember, fields=u'nextPageToken,groups(email)') i = 0 count = len(groups_to_get) for group in groups_to_get: @@ -9313,11 +9313,11 @@ def doPrintGroupMembers(): group_email = group[u'email'] sys.stderr.write(u'Getting members for %s (%s/%s)\n' % (group_email, i, count)) group_members = callGAPIpages(cd.members(), u'list', u'members', - message_attribute=u'email', groupKey=group_email, fields=fields) + message_attribute=u'email', groupKey=group_email, fields=fields) for member in group_members: for unwanted_item in [u'kind', u'etag']: if unwanted_item in member: - del(member[unwanted_item]) + del member[unwanted_item] for title in member: if title not in titles: titles.append(title) From f3f3f91fcb9a3a2112cf1b43948df73427c5a195 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 1 Sep 2016 10:10:19 -0700 Subject: [PATCH 2/2] Fix spacing --- src/gam.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gam.py b/src/gam.py index f91fd39e..51df3e0a 100755 --- a/src/gam.py +++ b/src/gam.py @@ -9305,7 +9305,7 @@ def doPrintGroupMembers(): sys.exit(2) if not groups_to_get: groups_to_get = callGAPIpages(cd.groups(), u'list', u'groups', message_attribute=u'email', - customer=customer, domain=usedomain, userKey=usemember, fields=u'nextPageToken,groups(email)') + customer=customer, domain=usedomain, userKey=usemember, fields=u'nextPageToken,groups(email)') i = 0 count = len(groups_to_get) for group in groups_to_get: