@@ -11,7 +11,9 @@ class Chunk(object):
11
11
def __init__ (self , version , meta , data ):
12
12
self .version = six .ensure_str (version )
13
13
self .meta = json .loads (meta )
14
- self .data = csv .DictReader (io .StringIO (data .decode ("utf-8" )), dialect = splunklib .searchcommands .internals .CsvDialect )
14
+ dialect = splunklib .searchcommands .internals .CsvDialect
15
+ self .data = csv .DictReader (io .StringIO (data .decode ("utf-8" )),
16
+ dialect = dialect )
15
17
16
18
17
19
class ChunkedDataStreamIter (collections .Iterator ):
@@ -40,20 +42,19 @@ def __init__(self, stream):
40
42
def read_chunk (self ):
41
43
header = self .stream .readline ()
42
44
43
- while len ( header ) > 0 and header .strip () == b'' :
45
+ while header > 0 and header .strip () == b'' :
44
46
header = self .stream .readline () # Skip empty lines
45
47
46
- if len ( header ) == 0 :
48
+ if not header == 0 :
47
49
raise EOFError
48
50
version , meta , data = header .rstrip ().split (b',' )
49
51
metabytes = self .stream .read (int (meta ))
50
52
databytes = self .stream .read (int (data ))
51
- print ("sent" )
52
53
return Chunk (version , metabytes , databytes )
53
54
54
55
55
- def build_chunk (kv , data = None ):
56
- metadata = six .ensure_binary (json .dumps (kv ), 'utf-8' )
56
+ def build_chunk (keyval , data = None ):
57
+ metadata = six .ensure_binary (json .dumps (keyval ), 'utf-8' )
57
58
data_output = _build_data_csv (data )
58
59
return b"chunked 1.0,%d,%d\n %s%s" % (len (metadata ), len (data_output ), metadata , data_output )
59
60
@@ -71,7 +72,10 @@ def build_empty_searchinfo():
71
72
72
73
73
74
def build_getinfo_chunk ():
74
- return build_chunk ({'action' : 'getinfo' , 'preview' : False , 'searchinfo' : build_empty_searchinfo ()})
75
+ return build_chunk ({
76
+ 'action' : 'getinfo' ,
77
+ 'preview' : False ,
78
+ 'searchinfo' : build_empty_searchinfo ()})
75
79
76
80
77
81
def build_data_chunk (data , finished = True ):
@@ -88,7 +92,8 @@ def _build_data_csv(data):
88
92
headers = set ()
89
93
for datum in data :
90
94
headers .update (datum .keys ())
91
- writer = csv .DictWriter (csvout , headers , dialect = splunklib .searchcommands .internals .CsvDialect )
95
+ writer = csv .DictWriter (csvout , headers ,
96
+ dialect = splunklib .searchcommands .internals .CsvDialect )
92
97
writer .writeheader ()
93
98
for datum in data :
94
99
writer .writerow (datum )
0 commit comments