File tree Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -82,12 +82,22 @@ def _build_data_csv(data):
82
82
return b''
83
83
if isinstance (data , bytes ):
84
84
return data
85
- csvout = io .StringIO ()
85
+ if six .PY2 :
86
+ csvout = io .BytesIO ()
87
+ else :
88
+ csvout = io .StringIO ()
89
+
86
90
headers = set ()
87
91
for datum in data :
88
- headers .update (datum .keys ())
92
+ if six .PY2 :
93
+ headers .update (datum .keys ())
94
+ else :
95
+ headers .update (datum .keys ())
89
96
writer = csv .DictWriter (csvout , headers , dialect = splunklib .searchcommands .internals .CsvDialect )
90
97
writer .writeheader ()
91
98
for datum in data :
92
- writer .writerow (datum )
93
- return csvout .getvalue ().encode ("utf-8" )
99
+ if six .PY2 :
100
+ writer .writerow (datum )
101
+ else :
102
+ writer .writerow (datum )
103
+ return six .ensure_binary (csvout .getvalue ())
You can’t perform that action at this time.
0 commit comments