Skip to content

Commit 6bdea8f

Browse files
committed
Fixed formatjson quotechar <Character> bug
1 parent da24220 commit 6bdea8f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/GamUpdate.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
7.34.10
2+
3+
Fixed bug where `formatjson quotechar <Character>` on the command line did not override `redirect csv <FileName> multiprocess quotechar <Character>`.
4+
15
7.34.09
26

37
Updated `gam <UserTypeEntity> update photo` to delete the user's existing photo

src/gam/__init__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"""
2626

2727
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
28-
__version__ = '7.34.09'
28+
__version__ = '7.34.10'
2929
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
3030

3131
# pylint: disable=wrong-import-position
@@ -9725,8 +9725,6 @@ def reopenSTDFile(stdtype):
97259725
GC.Values[GC.TIMEZONE] = tzinfo
97269726
GC.Values[GC.OUTPUT_TIMEFORMAT] = output_timeformat
97279727
clearRowFilters = False
9728-
# if sys.platform.startswith('win'):
9729-
# signal.signal(signal.SIGINT, signal.SIG_IGN)
97309728
if multiprocessing.get_start_method() != 'fork':
97319729
signal.signal(signal.SIGINT, signal.SIG_IGN)
97329730
Cmd = glclargs.GamCLArgs()
@@ -9776,7 +9774,7 @@ def reopenSTDFile(stdtype):
97769774
GC.Values = dataItem
97779775
csvPF.SetColumnDelimiter(GC.Values[GC.CSV_OUTPUT_COLUMN_DELIMITER])
97789776
csvPF.SetNoEscapeChar(GC.Values[GC.CSV_OUTPUT_NO_ESCAPE_CHAR])
9779-
csvPF.SetQuoteChar(GC.Values[GC.CSV_OUTPUT_QUOTE_CHAR])
9777+
# csvPF.SetQuoteChar(GC.Values[GC.CSV_OUTPUT_QUOTE_CHAR])
97809778
csvPF.SetSortHeaders(GC.Values[GC.CSV_OUTPUT_SORT_HEADERS])
97819779
csvPF.SetTimestampColumn(GC.Values[GC.CSV_OUTPUT_TIMESTAMP_COLUMN])
97829780
csvPF.SetHeaderFilter(GC.Values[GC.CSV_OUTPUT_HEADER_FILTER])
@@ -9843,8 +9841,6 @@ def _writePidData(pid, data):
98439841
except IOError as e:
98449842
systemErrorExit(FILE_ERROR_RC, fdErrorMessage(fd, GM.Globals[stdtype][GM.REDIRECT_NAME], e))
98459843

9846-
# if sys.platform.startswith('win'):
9847-
# signal.signal(signal.SIGINT, signal.SIG_IGN)
98489844
if multiprocessing.get_start_method() != 'fork':
98499845
signal.signal(signal.SIGINT, signal.SIG_IGN)
98509846
GM.Globals = gmGlobals.copy()
@@ -9938,7 +9934,6 @@ def ProcessGAMCommandMulti(pid, numItems, logCmd, mpQueueCSVFile, mpQueueStdout,
99389934

99399935
with mplock:
99409936
initializeLogging()
9941-
# if sys.platform.startswith('win'):
99429937
if multiprocessing.get_start_method() != 'fork':
99439938
signal.signal(signal.SIGINT, signal.SIG_IGN)
99449939
GM.Globals[GM.API_CALLS_RETRY_DATA] = {}

0 commit comments

Comments
 (0)