Changeset 3018

Timestamp:

09/15/06 16:31:53 (18 years ago)

Author:

jerome

Message:

Ensures that the billing code and username are encoded into the user's charset
after they have been overwritten through the overwrite_jobticket directive.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -361 +361 @@
             self.OriginalJobBillingCode = None
         else :    
+            self.JobBillingCode = self.UTF8ToUserCharset(self.JobBillingCode)
             self.OriginalJobBillingCode = self.JobBillingCode[:]
             
@@ -466 +467 @@
                         action = "CANCEL"
                     elif line.startswith("USERNAME=") :    
-                        username = line.split("=", 1)[1].strip()
+                        username = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
                         self.logdebug("Seen new username [%s]" % username)
                     elif line.startswith("BILLINGCODE=") :    
-                        billingcode = line.split("=", 1)[1].strip()
+                        billingcode = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
                         self.logdebug("Seen new billing code [%s]" % billingcode)
             except IOError, msg :            

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.25alpha12 (2006-09-15) :
+    
+        - Fixes encoding of username and billingcode when they
+          are overwritten by a subprocess.
+          
     - 1.25alpha11 (2006-09-06) :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.25alpha11_unofficial"
+__version__ = "1.25alpha12_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."