Strip blanks, handle empty entries in gam file and gam csvfile

This commit is contained in:
Ross Scroggs
2016-02-12 06:03:20 -08:00
parent 6dae2302c0
commit ca059a62a6

View File

@ -8664,8 +8664,12 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, return_uids=Fa
pass
elif entity_type == u'file':
users = []
filename = entity
users = readFile(filename, u'rb').splitlines()
f = openFile(entity)
for row in f:
user = row.strip()
if user:
users.append(user)
closeFile(f)
elif entity_type == u'csvfile':
try:
(filename, column) = entity.split(u':')
@ -8679,8 +8683,9 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, return_uids=Fa
systemErrorExit(2, MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS.format(column, ','.join(input_file.fieldnames)))
users = []
for row in input_file:
if column in row:
users.append(row[column])
user = row[column].strip()
if user:
users.append(user)
closeFile(f)
elif entity_type in [u'courseparticipants', u'teachers', u'students']:
croom = buildGAPIObject(u'classroom')