diff --git a/pym/cl_utils2.py b/pym/cl_utils2.py index ae349b4..802c8dc 100644 --- a/pym/cl_utils2.py +++ b/pym/cl_utils2.py @@ -64,16 +64,23 @@ class cl_params: for par in self.data: if par.has_key("shortOption") and self.access(par): if par["shortOption"] == shortOption: - if par.has_key("optVal"): - longOption = par["longOption"] + " " +\ - par["optVal"] - else: - longOption = par["longOption"] numChapter = self.getChapterNumber(par['helpChapter']) - helpTxt = pcs( - " -%s, --%s "%(par["shortOption"],longOption), - self.column_width, par['help'], - CONWIDTH-self.column_width) + if par.has_key("longOption"): + if par.has_key("optVal"): + longOption = par["longOption"] + " " +\ + par["optVal"] + else: + longOption = par["longOption"] + + helpTxt = pcs( + " -%s, --%s "%(par["shortOption"],longOption), + self.column_width, par['help'], + CONWIDTH-self.column_width) + else: + helpTxt = pcs( + " -%s "%(par["shortOption"]), + self.column_width, par['help'], + CONWIDTH-self.column_width) self.addChapterHelp(numChapter,helpTxt) break for par in self.data: @@ -149,7 +156,8 @@ class cl_params: # Из любой опции получаем короткую опцию for par in self.data: if par.has_key("shortOption") and self.access(par): - if par["longOption"] == option or \ + if (par.has_key("longOption") and\ + par["longOption"] == option) or \ par["shortOption"] == option: return par["shortOption"] break