Changeset 3367

Timestamp:

05/03/08 18:58:06 (17 years ago)

Author:

jerome

Message:

Moved new method around.

Location:

pykota/trunk

Files:

• bin/pkbcodes (modified) (1 diff)
• bin/pkinvoice (modified) (1 diff)
• bin/pkprinters (modified) (1 diff)
• bin/pkrefund (modified) (1 diff)
• bin/pkturnkey (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)
• pykota/utils.py (modified) (1 diff)

pykota/trunk/bin/pkbcodes

@@ -46 +46 @@
     def main(self, names, options) :
         """Manage billing codes."""
-        if (not self.config.isAdmin) and (options.action != "list") :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+        if options.action != "list" :
+            self.adminOnly()
            
         islist = (options.action == "list")

pykota/trunk/bin/pkinvoice

@@ -189 +189 @@
             raise PyKotaToolError, "The Python Imaging Library is missing. Download it from http://www.pythonware.com/downloads"
             
-        if not self.config.isAdmin :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+        self.adminOnly()
         
         self.pagesize = getPageSize(options.pagesize)

pykota/trunk/bin/pkprinters

@@ -190 +190 @@
     def main(self, names, options) :
         """Manage printers."""
-        if (not self.config.isAdmin) and (not options["list"]) :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+        if not options["list"] :
+            self.adminOnly()
             
         docups = options["cups"]

pykota/trunk/bin/pkrefund

@@ -183 +183 @@
             raise PyKotaToolError, "The Python Imaging Library is missing. Download it from http://www.pythonware.com/downloads"
             
-        if not self.config.isAdmin :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+        self.adminOnly()    
             
         self.pagesize = getPageSize(options.pagesize)

pykota/trunk/bin/pkturnkey

@@ -381 +381 @@
     def main(self, names, options) :
         """Intializes PyKota's database."""
-        if not self.config.isAdmin :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], \
-                                   _("You're not allowed to use this command."))
-            
+        self.adminOnly()
+        
         if not names :
             names = ["*"]

pykota/trunk/pykota/tool.py

@@ -171 +171 @@
         sys.stderr.flush()
         
+    def adminOnly(self, restricted=True) :
+        """Raises an exception if the user is not a PyKota administrator."""
+        if restricted and not self.config.isAdmin :
+            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+            
     def matchString(self, s, patterns) :
         """Returns True if the string s matches one of the patterns, else False."""

pykota/trunk/pykota/utils.py

@@ -31 +31 @@
 from pykota.errors import PyKotaCommandLineError
 
-def onlyAdmin(app, restricted=True) :
-    """Raises an exception if the user is not a PyKota administrator."""
-    if restricted and not app.config.isAdmin :
-        raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
-        
 def initlocale(lang="", cset=None) :
     """Initializes the locale stuff."""