git push origin masterMerge branch 'ksdtech-master'

This commit is contained in:
Jay Lee
2014-09-12 05:13:20 -04:00

6
gam.py
View File

@ -4185,7 +4185,7 @@ def doUpdateGroup():
gs_object = buildDiscoveryObject(u'groupssettings') gs_object = buildDiscoveryObject(u'groupssettings')
matches_gs_setting = False matches_gs_setting = False
for (attrib, params) in gs_object[u'schemas'][u'Groups'][u'properties'].items(): for (attrib, params) in gs_object[u'schemas'][u'Groups'][u'properties'].items():
if attrib in [u'kind', u'etag', u'email', u'name', u'description']: if attrib in [u'kind', u'etag', u'email']:
continue continue
if sys.argv[i].lower().replace(u'_', u'') == attrib.lower(): if sys.argv[i].lower().replace(u'_', u'') == attrib.lower():
matches_gs_setting = True matches_gs_setting = True
@ -4211,7 +4211,7 @@ def doUpdateGroup():
value = u'false' value = u'false'
break break
if not matches_gs_setting: if not matches_gs_setting:
print u'ERROR: %s is not a valid argument for "gam create group..."' % sys.argv[i] print u'ERROR: %s is not a valid argument for "gam update group..."' % sys.argv[i]
sys.exit(9) sys.exit(9)
gs_body[attrib] = value gs_body[attrib] = value
use_gs_api = True use_gs_api = True
@ -6620,7 +6620,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, return_uids=Fa
if not silent: if not silent:
sys.stderr.write(u"Getting %s of %s (may take some time for large groups)..." % (member_type_message, group)) sys.stderr.write(u"Getting %s of %s (may take some time for large groups)..." % (member_type_message, group))
page_message = u'Got %%%%total_items%%%% %s...' % member_type_message page_message = u'Got %%%%total_items%%%% %s...' % member_type_message
members = callGAPIpages(service=cd.members(), function=u'list', page_message=page_message, groupKey=group, roles=member_type, fields=u'nextPageToken,members(email,id)') members = callGAPIpages(service=cd.members(), function=u'list', items=u'members', page_message=page_message, groupKey=group, roles=member_type, fields=u'nextPageToken,members(email,id)')
users = [] users = []
for member in members: for member in members:
if return_uids: if return_uids: