Changeset 3547

Timestamp:

08/17/10 03:08:14 (14 years ago)

Author:

jerome

Message:

Major (temporary ?) fix for a very old bug : the job options were
retrieved from the command line, and automatically converted to unicode
when cupspykota started. All other job attributes were retrieved from a
getJobAttributes() request to CUPS, and returned in utf-8. When looping
over all job attributes (including options) there was a character
encoding mismatch cause the cupspykota backend to fail miserably.
This fix may be improved later.

Location:

pykota/trunk/pykota

Files:

• cups.py (modified) (1 diff)
• version.py (modified) (1 diff)

pykota/trunk/pykota/cups.py

@@ -86 +86 @@
             self.OriginatingUserName = self.OriginatingUserName.split("@", 1)[0].split("/")[0]
 
+        # The options weren't retrieved from the job ticket but from the
+        # command line instead, so they already are in unicode form.
+        # That's why we convert them back to the ticket's charset.
+        try :
+            self.Options = self.Options.encode(self.Charset, "replace")
+        except AttributeError :
+            pass
+
         for attrib in ("OriginatingUserName",
                        "OriginatingHostName",

pykota/trunk/pykota/version.py

@@ -24 +24 @@
 import time
 
-__version__ = "1.27alpha11_unofficial"
+__version__ = "1.27alpha12_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."