[chirp_devel] [PATCH] Fixes case where column order setting parsing was calling split on None. #5355
Christopher Hoover
Sun Nov 19 11:51:25 PST 2017
# HG changeset patch
# User Christopher Hoover <ch at murgatroid.com>
# Date 1511121077 28800
# Sun Nov 19 11:51:17 2017 -0800
# Node ID 362f05a8f06985306f807e476450254e21d1936e
# Parent fd6871c5064f6d1f80d33e12e05cc671a05652ce
Fixes case where column order setting parsing was calling split on None. #5355
diff -r fd6871c5064f -r 362f05a8f069 chirp/ui/memedit.py
--- a/chirp/ui/memedit.py Sun Nov 05 21:16:23 2017 -0500
+++ b/chirp/ui/memedit.py Sun Nov 19 11:51:17 2017 -0800
@@ -961,15 +961,19 @@
default_col_order = [x for x, y, z in self.cols if z]
try:
- col_order = self._config.get("column_order_%s" %
- self.__class__.__name__).split(",")
- if len(col_order) != len(default_col_order):
- raise Exception()
- for i in col_order:
- if i not in default_col_order:
+ config_setting = self._config.get("column_order_%s" %
+ self.__class__.__name__)
+ if config_setting is None:
+ col_order = default_col_order
+ else:
+ col_order = config_setting.split(",")
+ if len(col_order) != len(default_col_order):
raise Exception()
+ for i in col_order:
+ if i not in default_col_order:
+ raise Exception()
except Exception, e:
- LOG.error(e)
+ LOG.error("column order setting: %s", e)
col_order = default_col_order
non_editable = [_("Loc")]
More information about the chirp_devel
mailing list