deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 04:41:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Set universal newline mode for CSV files (#588)

Browse Source 
This fixes issue with Mac Excel which uses \r as line separator
This commit is contained in:
Ross Scroggs
2017-09-18 11:25:23 -07:00
committed by Jay Lee
parent 4563441a3a
commit 919f54d0d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gam.py
View File

@@ -11042,7 +11042,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
filename = column = None filename = column = None
if (not filename) or (not column): if (not filename) or (not column):
systemErrorExit(2, u'Expected {0} FileName:FieldName'.format(entity_type)) systemErrorExit(2, u'Expected {0} FileName:FieldName'.format(entity_type))
f = openFile(filename) f = openFile(filename, mode='rbU')
input_file = csv.DictReader(f, restval=u'') input_file = csv.DictReader(f, restval=u'')
if column not in input_file.fieldnames: if column not in input_file.fieldnames:
csvFieldErrorExit(column, input_file.fieldnames) csvFieldErrorExit(column, input_file.fieldnames)
@@ -11563,7 +11563,7 @@ def ProcessGAMCommand(args):
i = 2 i = 2
filename = sys.argv[i] filename = sys.argv[i]
i, encoding = getCharSet(i+1) i, encoding = getCharSet(i+1)
f = openFile(filename, mode=u'rb') f = openFile(filename, mode=u'rbU')
csvFile = UnicodeDictReader(f, encoding=encoding) csvFile = UnicodeDictReader(f, encoding=encoding)
if (i == len(sys.argv)) or (sys.argv[i].lower() != u'gam') or (i+1 == len(sys.argv)): if (i == len(sys.argv)) or (sys.argv[i].lower() != u'gam') or (i+1 == len(sys.argv)):
print u'ERROR: "gam csv <filename>" must be followed by a full GAM command...' print u'ERROR: "gam csv <filename>" must be followed by a full GAM command...'