<div dir="ltr"><div class="gmail_quote"><br># HG changeset patch<br>
# User Christopher Hoover <<a href="mailto:ch@murgatroid.com">ch@murgatroid.com</a>><br>
# Date 1510450576 28800<br>
# Sat Nov 11 17:36:16 2017 -0800<br>
# Node ID c229e2d488fecb516ede6cf12a700c<wbr>5bbe24bfc2<br>
# Parent 0e0470d3e892bfd4818bfb972b8b85<wbr>d58f2b00d4<br>
Fixes CSV header, which was missing a column.<br>
<br>
Asserts header and rows agree in arity during writing to prevent<br>
future regressions.<br>
<br>
diff -r 0e0470d3e892 -r c229e2d488fe chirp/chirp_common.py<br>
--- a/chirp/chirp_common.py Fri Nov 03 20:24:29 2017 -0400<br>
+++ b/chirp/chirp_common.py Sat Nov 11 17:36:16 2017 -0800<br>
@@ -321,7 +321,7 @@<br>
"rToneFreq", "cToneFreq", "DtcsCode",<br>
"DtcsPolarity", "Mode", "TStep",<br>
"Skip", "Comment",<br>
- "URCALL", "RPT1CALL", "RPT2CALL"]<br>
+ "URCALL", "RPT1CALL", "RPT2CALL", "DVCODE"]<br>
<br>
def __setattr__(self, name, val):<br>
if not hasattr(self, name):<br>
diff -r 0e0470d3e892 -r c229e2d488fe csvdump/csvapp.py<br>
--- a/csvdump/csvapp.py Fri Nov 03 20:24:29 2017 -0400<br>
+++ b/csvdump/csvapp.py Sat Nov 11 17:36:16 2017 -0800<br>
@@ -119,7 +119,9 @@<br>
<br>
print >>f, chirp.chirp_common.Memory.CSV_<wbr>FORMAT<br>
for m in self.radio.get_memories():<br>
- print >>f, m.to_csv()<br>
+ csv = m.to_csv()<br>
+ assert len(csv) == len(chirp.chirp_common.Memory.<wbr>CSV_FORMAT)<br>
+ print >>f, csv<br>
count += 1<br>
f.close()<br>
<br>
@@ -145,7 +147,9 @@<br>
<br>
try:<br>
m = self.radio.get_memory(i)<br>
- print >>f, m.to_csv()<br>
+ csv = m.to_csv()<br>
+ assert len(csv) == len(chirp.chirp_common.Memory.<wbr>CSV_FORMAT)<br>
+ print >>f, csv<br>
except chirp.errors.<wbr>InvalidMemoryLocation:<br>
pass<br>
<br>
</div><br></div>