Changeset 763

Timestamp:

02/08/03 23:09:02 (21 years ago)

Author:

jalet

Message:

Only printer was added the first time.

Files:

• pykota/trunk/bin/edpykota (modified) (3 diffs)

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.13  2003/02/08 22:09:02  jalet
+# Only printer was added the first time.
+#
 # Revision 1.12  2003/02/08 21:44:49  jalet
 # Python 2.1 string module doesn't define ascii_letters
@@ -137 +140 @@
 class EdPyKota(PyKotaTool) :        
     """A class for edpykota."""
-    def isValidPrinterName(self, printername) :
-        """Checks if a printername is valid."""
-        # unfortunately Python 2.1 string modules doesn't define ascii_letters...
-        asciiletters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        digits = '0123456789'
-        if printername[0] in asciiletters :
-            validchars = asciiletters + digits + "-_"
-            for c in printername[1:] :
-                if c not in validchars :
-                    return 0
-            return 1        
-        return 0
-        
     def main(self, names, options) :
         """Edit user or group quotas."""
@@ -156 +146 @@
             pname = options["printer"]
             if options["add"] and pname :
-                if self.isValidPrinterName(pname) :
+                if self.isValidName(pname) :
                     self.storage.addPrinter(pname)
+                    printernames = [ pname ]
                 else :    
                     raise PyKotaToolError, "Invalid printer name %s" % pname