Changeset 1152 for pykota/trunk/pykota

Timestamp:

10/08/03 23:41:38 (21 years ago)

Author:

jalet

Message:

External policies for printers works !
We can now auto-add users on first print, and do other useful things if needed.

Location:

pykota/trunk/pykota

Files:

• config.py (modified) (2 diffs)
• tool.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.39  2003/10/08 21:41:38  jalet
+# External policies for printers works !
+# We can now auto-add users on first print, and do other useful things if needed.
+#
 # Revision 1.38  2003/10/07 22:06:05  jalet
 # Preliminary code to disable job history
@@ -320 +324 @@
     def getPrinterPolicy(self, printer) :    
         """Returns the default policy for the current printer."""
-        validpolicies = [ "ALLOW", "DENY" ]     
-        try :
-            policy = self.getPrinterOption(printer, "policy").upper()
-        except PyKotaConfigError :    
-            policy = "DENY"
-        if policy not in validpolicies :
-            raise PyKotaConfigError, _("Option policy in section %s only supports values in %s") % (printer, str(validpolicies))
-        return policy
+        validpolicies = [ "ALLOW", "DENY", "EXTERNAL" ]     
+        try :
+            fullpolicy = self.getPrinterOption(printer, "policy")
+        except PyKotaConfigError :    
+            return ("DENY", None)
+        else :    
+            try :
+                policy = [x.strip() for x in fullpolicy.split('(', 1)]
+            except ValueError :    
+                raise PyKotaConfigError, _("Invalid policy %s for printer %s") % (fullpolicy, printer)
+            if len(policy) == 1 :    
+                policy.append("")
+            (policy, args) = policy    
+            if args.endswith(')') :
+                args = args[:-1]
+            policy = policy.upper()    
+            if (policy == "EXTERNAL") and not args :
+                raise PyKotaConfigError, _("Invalid policy %s for printer %s") % (fullpolicy, printer)
+            if policy not in validpolicies :
+                raise PyKotaConfigError, _("Option policy in section %s only supports values in %s") % (printer, str(validpolicies))
+            return (policy, args)
         
     def getSMTPServer(self) :    

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.53  2003/10/08 21:41:38  jalet
+# External policies for printers works !
+# We can now auto-add users on first print, and do other useful things if needed.
+#
 # Revision 1.52  2003/10/07 09:07:28  jalet
 # Character encoding added to please latest version of Python
@@ -435 +439 @@
                 
         # then we check the user's own quota
-        policy = self.config.getPrinterPolicy(printer.Name)
+        # if we get there we are sure that policy is not EXTERNAL
+        (policy, dummy) = self.config.getPrinterPolicy(printer.Name)
         if user.LimitBy and (user.LimitBy.lower() == "balance") : 
             if user.AccountBalance is None :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.15alpha8_unofficial"
+__version__ = "1.15alpha9_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""