@@ -31,7 +31,7 @@ def default_vf_table(self,source='_vf',file_location=None):
31
31
32
32
@memoize ('DEFAULT_CANDIDATE_TABLE' )
33
33
def default_candidate_table (self ,source = '_ca' ,file_location = None ):
34
- return self .specific_table ((self .source_prefix or '' ) + source ,file_location or self .candidate_file_location )
34
+ return self .specific_table ((self .source_prefix or '' ) + source ,file_location or self .candidate_file_location , ',' )
35
35
36
36
@memoize ('DEFAULT_OFFICE_HOLDER_TABLE' )
37
37
def default_office_holder_table (self ,file_location = None ):
@@ -42,16 +42,16 @@ def default_office_holder_table(self,file_location=None):
42
42
43
43
@memoize ('DEFAULT_REFERENDA_TABLE' )
44
44
def default_referenda_table (self ,file_location = None ):
45
- return self .specific_table ('referenda' ,file_location or self .referenda_file_location )
45
+ return self .specific_table ('referenda' ,file_location or self .referenda_file_location , ',' )
46
46
47
47
@memoize ('DEFAULT_ELECTION_TABLE' )
48
48
def default_election_table (self ,source = '_elec' ,file_location = None ):
49
49
return self .specific_table ((self .source_prefix or '' ) + source ,file_location or self .election_file_location )
50
50
51
- def specific_table (self ,source ,file_location ):
51
+ def specific_table (self ,source ,file_location , field_sep = voterfile_delimiter ):
52
52
return dict (self .DEFAULT_TABLE .items () + {
53
53
'filename' :file_location ,
54
- 'field_sep' :voterfile_delimiter ,
54
+ 'field_sep' :field_sep ,
55
55
'udcs' :dict (self .DEFAULT_TABLE ['udcs' ].items ()+ {'source' :source }.items ()),
56
56
}.items ())
57
57
0 commit comments