Minor tweaks for compatibility

This commit is contained in:
Ross Scroggs
2016-03-05 18:40:01 -08:00
parent bf31e72384
commit 82d43d0b62

View File

@ -6552,7 +6552,7 @@ def doGetGroupInfo(group_name=None):
if getGroups: if getGroups:
groups = callGAPIpages(cd.groups(), u'list', u'groups', groups = callGAPIpages(cd.groups(), u'list', u'groups',
userKey=basic_info[u'email'], fields=u'nextPageToken,groups(name,email)') userKey=basic_info[u'email'], fields=u'nextPageToken,groups(name,email)')
if groups and len(groups) > 0: if groups:
print u'Groups: ({0})'.format(len(groups)) print u'Groups: ({0})'.format(len(groups))
for groupm in groups: for groupm in groups:
print u' %s: %s' % (groupm[u'name'], groupm[u'email']) print u' %s: %s' % (groupm[u'name'], groupm[u'email'])
@ -7461,7 +7461,7 @@ def doPrintUsers():
elif sys.argv[i].lower() == u'query': elif sys.argv[i].lower() == u'query':
query = sys.argv[i+1] query = sys.argv[i+1]
i += 2 i += 2
elif sys.argv[i].lower() in [u'firstname', u'givenname', u'lastname', u'familyName', u'fullname']: elif sys.argv[i].lower() in [u'firstname', u'givenname', u'lastname', u'familyName', u'fullname', u'name']:
user_fields.append(u'name') user_fields.append(u'name')
i += 1 i += 1
elif sys.argv[i].lower() == u'ou': elif sys.argv[i].lower() == u'ou':