git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@128 c91db197-33c1-4113-bf15-f8a5c547ca64

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(
+                        if par.has_key("longOption"):
-                            "  -%s, --%s "%(par["shortOption"],longOption),
+                            if par.has_key("optVal"):
-                            self.column_width, par['help'],
+                                longOption = par["longOption"] + " " +\
-                            CONWIDTH-self.column_width)
+                                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