Changeset 3306

Timestamp:

01/30/08 13:56:28 (16 years ago)

Author:

jerome

Message:

Fixed some character encoding problems when CUPS' locale was not C : my
earlier tests didn't take this into account.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• pykota/loggers/system.py (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -580 +580 @@
         setenv("PYKOTAPGROUPS", ",".join([p.Name for p in self.storage.getParentPrinters(self.Printer)]), self.charset)
         setenv("PYKOTAPRINTERDESCRIPTION", self.Printer.Description or "", self.charset)
-        setenv("PYKOTAPRINTERMAXJOBSIZE", str(self.Printer.MaxJobSize or _("Unlimited")), self.charset)
+        setenv("PYKOTAPRINTERMAXJOBSIZE", ((self.Printer.MaxJobSize is None) and _("Unlimited")) or str(self.Printer.MaxJobSize), self.charset)
         setenv("PYKOTAPRINTERPASSTHROUGHMODE", (self.Printer.PassThrough and _("ON")) or _("OFF"), self.charset)
         setenv("PYKOTAPRICEPERPAGE", str(self.Printer.PricePerPage or 0), self.charset)

pykota/trunk/pykota/loggers/system.py

@@ -23 +23 @@
 """This module defines a class for PyKota logging through syslog."""
 
+import sys
 import os
 import syslog
@@ -47 +48 @@
                            syslog.LOG_DEBUG)
         syslog.syslog(priority, "(PID %s) : %s" \
-                                      % (os.getpid(), message.strip()))
+                                      % (os.getpid(), message.strip().encode(sys.stdout.encoding or "UTF-8", "replace")))