From ca059a62a65e1a6ac5fc76c697268bf658971703 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Fri, 12 Feb 2016 06:03:20 -0800
Subject: [PATCH] Strip blanks, handle empty entries in gam file and gam
 csvfile

---
 src/gam.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/gam.py b/src/gam.py
index f813477c..2fc52eed 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -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')