Changeset 2512 for pykota/trunk/pykota/dumper.py

Timestamp:

09/27/05 20:34:31 (19 years ago)

Author:

jerome

Message:

Ensure that human made errors (like incorrect command line options)
don't produce a traceback anymore. No need to frighten users with
such complete tracebacks and email reporting each time they mistype
some command.
Makes pykosd check more carefully the values of its command line options.

Files:

• pykota/trunk/pykota/dumper.py (modified) (5 diffs)

pykota/trunk/pykota/dumper.py

@@ -39 +39 @@
 
 from pykota import version
-from pykota.tool import PyKotaTool, PyKotaToolError, N_
+from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, N_
 
 class DumPyKota(PyKotaTool) :        
@@ -72 +72 @@
         """Print Quota Data Dumper."""
         if restricted and not self.config.isAdmin :
-            raise PyKotaToolError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
             
         extractonly = {}
@@ -82 +82 @@
                         raise ValueError                
                 except ValueError :    
-                    raise PyKotaToolError, _("Invalid filter value [%s], see help.") % filterexp
+                    raise PyKotaCommandLineError, _("Invalid filter value [%s], see help.") % filterexp
                 else :    
                     extractonly.update({ filterkey : filtervalue })
@@ -88 +88 @@
         datatype = options["data"]
         if datatype not in self.validdatatypes.keys() :
-            raise PyKotaToolError, _("Invalid modifier [%s] for --data command line option, see help.") % datatype
+            raise PyKotaCommandLineError, _("Invalid modifier [%s] for --data command line option, see help.") % datatype
                     
         format = options["format"]
         if (format not in self.validformats.keys()) \
               or ((format == "cups") and ((datatype != "history") or options["sum"])) :
-            raise PyKotaToolError, _("Invalid modifier [%s] for --format command line option, see help.") % format
+            raise PyKotaCommandLineError, _("Invalid modifier [%s] for --format command line option, see help.") % format
             
         if (format == "xml") and not hasJAXML :
@@ -99 +99 @@
             
         if options["sum"] and datatype not in ("payments", "history") : 
-            raise PyKotaToolError, _("Invalid data type [%s] for --sum command line option, see help.") % datatype
+            raise PyKotaCommandLineError, _("Invalid data type [%s] for --sum command line option, see help.") % datatype
             
         entries = getattr(self.storage, "extract%s" % datatype.title())(extractonly)