Changeset 3298

Timestamp:

01/24/08 10:12:48 (16 years ago)

Author:

jerome

Message:

It seems that the lead developer can eat his own food again...
More testing needs to be done but printing should now work again at
least with the PostgreSQL backend.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (10 diffs)
• pykota/appinit.py (modified) (2 diffs)
• pykota/tool.py (modified) (4 diffs)
• pykota/utils.py (modified) (4 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -435 +435 @@
                 self.Action = action
                 self.Reason = (reason or _("Print job cancelled."))
-                os.environ["PYKOTASTATUS"] = "CANCELLED"
+                setenv("PYKOTASTATUS", "CANCELLED", self.charset)
             else :
                 # don't overwrite anything unless job authorized
@@ -530 +530 @@
         """Exports the actual job's attributes to the environment."""
         self.logdebug("Exporting job information to the environment...")
-        os.environ["DEVICE_URI"] = self.DeviceURI       # WARNING !
-        os.environ["PYKOTAPRINTERNAME"] = self.PrinterName
-        os.environ["PYKOTADIRECTORY"] = self.Directory
-        os.environ["PYKOTADATAFILE"] = self.DataFile
-        os.environ["PYKOTAJOBSIZEBYTES"] = str(self.JobSizeBytes)
-        os.environ["PYKOTAMD5SUM"] = self.JobMD5Sum
-        os.environ["PYKOTAJOBORIGINATINGHOSTNAME"] = self.Ticket.OriginatingHostName or ""
-        os.environ["PYKOTAJOBID"] = self.Ticket.JobId
-        os.environ["PYKOTAUSERNAME"] = self.UserName
-        os.environ["PYKOTAORIGINALUSERNAME"] = self.Ticket.OriginalUserName
-        os.environ["PYKOTATITLE"] = self.Ticket.Title
-        os.environ["PYKOTACOPIES"] = str(self.Ticket.Copies)
-        os.environ["PYKOTAOPTIONS"] = self.Ticket.Options
-        os.environ["PYKOTAFILENAME"] = self.Ticket.FileName or ""
-        os.environ["PYKOTAJOBBILLING"] = self.Ticket.BillingCode or ""
-        os.environ["PYKOTAORIGINALJOBBILLING"] = self.OriginalJobBillingCode or ""
-        os.environ["PYKOTAPRINTERHOSTNAME"] = self.PrinterHostName
-        os.environ["PYKOTAPRECOMPUTEDJOBSIZE"] = str(self.softwareJobSize)
+        setenv("DEVICE_URI", self.DeviceURI, self.charset) # WARNING !
+        setenv("PYKOTACHARSET", self.charset, self.charset)
+        setenv("PYKOTALANG", self.language, self.charset)
+        setenv("PYKOTAPRINTERNAME", self.PrinterName, self.charset)
+        setenv("PYKOTADIRECTORY", self.Directory, self.charset)
+        setenv("PYKOTADATAFILE", self.DataFile, self.charset)
+        setenv("PYKOTAJOBSIZEBYTES", str(self.JobSizeBytes), self.charset)
+        setenv("PYKOTAMD5SUM", self.JobMD5Sum, self.charset)
+        setenv("PYKOTAJOBORIGINATINGHOSTNAME", self.Ticket.OriginatingHostName or "", self.charset)
+        setenv("PYKOTAJOBID", self.Ticket.JobId, self.charset)
+        setenv("PYKOTAUSERNAME", self.UserName, self.charset)
+        setenv("PYKOTAORIGINALUSERNAME", self.Ticket.OriginalUserName, self.charset)
+        setenv("PYKOTATITLE", self.Ticket.Title, self.charset)
+        setenv("PYKOTACOPIES", str(self.Ticket.Copies), self.charset)
+        setenv("PYKOTAOPTIONS", self.Ticket.Options, self.charset)
+        setenv("PYKOTAFILENAME", self.Ticket.FileName or "", self.charset)
+        setenv("PYKOTAJOBBILLING", self.Ticket.BillingCode or "", self.charset)
+        setenv("PYKOTAORIGINALJOBBILLING", self.OriginalJobBillingCode or "", self.charset)
+        setenv("PYKOTAPRINTERHOSTNAME", self.PrinterHostName, self.charset)
+        setenv("PYKOTAPRECOMPUTEDJOBSIZE", str(self.softwareJobSize), self.charset)
         self.logdebug("Environment updated.")
         
@@ -553 +555 @@
         """Exports user information to the environment."""
         self.logdebug("Exporting user information to the environment...")
-        os.environ["PYKOTAOVERCHARGE"] = str(self.User.OverCharge)
-        os.environ["PYKOTALIMITBY"] = str(self.User.LimitBy)
-        os.environ["PYKOTABALANCE"] = str(self.User.AccountBalance or 0.0)
-        os.environ["PYKOTALIFETIMEPAID"] = str(self.User.LifeTimePaid or 0.0)
-        os.environ["PYKOTAUSERDESCRIPTION"] = str(self.User.Description or "")
-        
-        os.environ["PYKOTAPAGECOUNTER"] = str(self.UserPQuota.PageCounter or 0)
-        os.environ["PYKOTALIFEPAGECOUNTER"] = str(self.UserPQuota.LifePageCounter or 0)
-        os.environ["PYKOTASOFTLIMIT"] = str(self.UserPQuota.SoftLimit)
-        os.environ["PYKOTAHARDLIMIT"] = str(self.UserPQuota.HardLimit)
-        os.environ["PYKOTADATELIMIT"] = str(self.UserPQuota.DateLimit)
-        os.environ["PYKOTAWARNCOUNT"] = str(self.UserPQuota.WarnCount)
+        setenv("PYKOTAOVERCHARGE", str(self.User.OverCharge), self.charset)
+        setenv("PYKOTALIMITBY", str(self.User.LimitBy), self.charset)
+        setenv("PYKOTABALANCE", str(self.User.AccountBalance or 0.0), self.charset)
+        setenv("PYKOTALIFETIMEPAID", str(self.User.LifeTimePaid or 0.0), self.charset)
+        setenv("PYKOTAUSERDESCRIPTION", str(self.User.Description or ""), self.charset)
+        
+        setenv("PYKOTAPAGECOUNTER", str(self.UserPQuota.PageCounter or 0), self.charset)
+        setenv("PYKOTALIFEPAGECOUNTER", str(self.UserPQuota.LifePageCounter or 0), self.charset)
+        setenv("PYKOTASOFTLIMIT", str(self.UserPQuota.SoftLimit), self.charset)
+        setenv("PYKOTAHARDLIMIT", str(self.UserPQuota.HardLimit), self.charset)
+        setenv("PYKOTADATELIMIT", str(self.UserPQuota.DateLimit), self.charset)
+        setenv("PYKOTAWARNCOUNT", str(self.UserPQuota.WarnCount), self.charset)
         
         # TODO : move this elsewhere once software accounting is done only once.
-        os.environ["PYKOTAPRECOMPUTEDJOBPRICE"] = str(self.softwareJobPrice)
+        setenv("PYKOTAPRECOMPUTEDJOBPRICE", str(self.softwareJobPrice), self.charset)
         
         self.logdebug("Environment updated.")
@@ -576 +578 @@
         # exports the list of printers groups the current
         # printer is a member of
-        os.environ["PYKOTAPGROUPS"] = ",".join([p.Name for p in self.storage.getParentPrinters(self.Printer)])
-        os.environ["PYKOTAPRINTERDESCRIPTION"] = str(self.Printer.Description or "")
-        os.environ["PYKOTAPRINTERMAXJOBSIZE"] = str(self.Printer.MaxJobSize or _("Unlimited"))
-        os.environ["PYKOTAPRINTERPASSTHROUGHMODE"] = (self.Printer.PassThrough and _("ON")) or _("OFF")
-        os.environ["PYKOTAPRICEPERPAGE"] = str(self.Printer.PricePerPage or 0)
-        os.environ["PYKOTAPRICEPERJOB"] = str(self.Printer.PricePerJob or 0)
+        setenv("PYKOTAPGROUPS", ",".join([p.Name for p in self.storage.getParentPrinters(self.Printer)]), self.charset)
+        setenv("PYKOTAPRINTERDESCRIPTION", str(self.Printer.Description or ""), self.charset)
+        setenv("PYKOTAPRINTERMAXJOBSIZE", str(self.Printer.MaxJobSize or _("Unlimited")), self.charset)
+        setenv("PYKOTAPRINTERPASSTHROUGHMODE", (self.Printer.PassThrough and _("ON")) or _("OFF"), self.charset)
+        setenv("PYKOTAPRICEPERPAGE", str(self.Printer.PricePerPage or 0), self.charset)
+        setenv("PYKOTAPRICEPERJOB", str(self.Printer.PricePerJob or 0), self.charset)
         self.logdebug("Environment updated.")
         
@@ -587 +589 @@
         """Exports phase information to the environment."""
         self.logdebug("Exporting phase information [%s] to the environment..." % phase)
-        os.environ["PYKOTAPHASE"] = phase
+        setenv("PYKOTAPHASE", phase, self.charset)
         self.logdebug("Environment updated.")
         
@@ -593 +595 @@
         """Exports job's size and price information to the environment."""
         self.logdebug("Exporting job's size and price information to the environment...")
-        os.environ["PYKOTAJOBSIZE"] = str(self.JobSize)
-        os.environ["PYKOTAJOBPRICE"] = str(self.JobPrice)
+        setenv("PYKOTAJOBSIZE", str(self.JobSize), self.charset)
+        setenv("PYKOTAJOBPRICE", str(self.JobPrice), self.charset)
         self.logdebug("Environment updated.")
         
@@ -600 +602 @@
         """Exports the job's action status and optional reason."""
         self.logdebug("Exporting job's action status...")
-        os.environ["PYKOTAACTION"] = str(self.Action)
+        setenv("PYKOTAACTION", str(self.Action), self.charset)
         if self.Reason :
-            os.environ["PYKOTAREASON"] = str(self.Reason)
+            setenv("PYKOTAREASON", str(self.Reason), self.charset)
         self.logdebug("Environment updated.")
         
@@ -1078 +1080 @@
                 self.Action = "CANCEL"
                 self.Reason = _("Print job cancelled.")
-                os.environ["PYKOTASTATUS"] = "CANCELLED"
+                setenv("PYKOTASTATUS", "CANCELLED", self.charset)
                 
         # exports some new environment variables
@@ -1253 +1255 @@
         originalbackend = os.path.join(os.path.split(sys.argv[0])[0], self.RealBackend)
         if not isBanner :
-            arguments = [os.environ["DEVICE_URI"]] + sys.argv[1:]
+            arguments = [os.environ["DEVICE_URI"]] + [a.encode("UTF-8") for a in sys.argv[1:]]
         else :    
             # For banners, we absolutely WANT
             # to remove any filename from the command line !
             self.logdebug("It looks like we try to print a banner.")
-            arguments = [os.environ["DEVICE_URI"]] + sys.argv[1:6]
+            arguments = [os.environ["DEVICE_URI"]] + [a.encode("UTF-8") for a in sys.argv[1:6]]
         arguments[2] = self.UserName # in case it was overwritten by external script
         # TODO : do something about job-billing option, in case it was overwritten as well...
@@ -1264 +1266 @@
         # TODO : uses the job's title to name an output file (cups-pdf:// for example), we're stuck !
         
-        self.logdebug("Starting original backend %s with args %s" % (originalbackend, " ".join(['"%s"' % a for a in arguments])))
+        self.logdebug("Starting original backend %s with args %s" % (originalbackend, " ".join(['"%s"' % a.decode("UTF-8") for a in arguments])))
         pid = os.fork()
         self.logdebug("Forked !")

pykota/trunk/pykota/appinit.py

@@ -23 +23 @@
 
 import sys
+import os
 import locale
 import gettext
@@ -28 +29 @@
 from pykota.utils import *
 
-(lang, charset) = initlocale()
+(lang, charset) = initlocale(os.environ.get("PYKOTALANG", ""),
+                             os.environ.get("PYKOTACHARSET"))
 initgettext(lang, charset)
 

pykota/trunk/pykota/tool.py

@@ -96 +96 @@
         # Saves a copy of the locale settings
         (self.language, self.charset) = locale.getlocale()
+        if not self.language :
+            self.language = "C"
         if not self.charset :
             self.charset = "UTF-8"
@@ -165 +167 @@
         """Display a message but only if stdout is a tty."""
         if sys.stdout.isatty() :
-            sys.stdout.write(message.encode(sys.stdout.encoding or "UTF-8", \
+            sys.stdout.write(message.encode(self.charset, \
                                             "replace"))
             sys.stdout.flush()
@@ -172 +174 @@
         """Logs something to debug output if debug is enabled."""
         if self.debug :
-            self.logger.log_message(message.encode(sys.stdout.encoding \
-                                                       or "UTF-8", \
+            self.logger.log_message(message.encode(self.charset, \
                                                    "replace"), \
                                     "debug")
@@ -180 +181 @@
         """Sends a message to standard error."""
         sys.stderr.write("%s: %s\n" % (level.upper(), \
-                                       message.encode(sys.stdout.encoding \
-                                                          or "UTF-8", \
+                                       message.encode(self.charset, \
                                                       "replace")))
         sys.stderr.flush()

pykota/trunk/pykota/utils.py

@@ -40 +40 @@
         charset = sys.stdout.encoding or sys.getfilesystemencoding()
 
-    # Dirty hack : if the charset is ASCII, we can safely use UTF-8 instead
-    # This has the advantage of allowing transparent support for recent
-    # versions of CUPS which (en-)force charset to UTF-8 when printing.
-    # This should be needed only when printing, but is probably (?) safe
-    # to do when using interactive commands.
-    if charset.upper() in ('ASCII', 'ANSI_X3.4-1968') :
+    if (not charset) or charset in ("ASCII", "ANSI_X3.4-1968") :
         charset = "UTF-8"
+        
     return (language, charset)
 
+def setenv(varname, value, charset) :
+    """Sets an environment variable."""
+    if value is None :
+        value = "None"
+    os.environ[varname] = value.encode(charset, "replace")    
+    
 def initgettext(lang, cset) :
     """Initializes gettext translations for PyKota."""
@@ -86 +88 @@
 
 def databaseToUnicode(text) :
-    """Converts from database format (UTF-8) to unicode."""
+    """Converts from database format (UTF-8) to unicode.
+    
+       We use "replace" to accomodate legacy datas which may not
+       have been recorded correctly.
+    """
     if text is not None :
         return text.decode("UTF-8", "replace")
@@ -95 +101 @@
     """Converts from unicode to database format (UTF-8)."""
     if text is not None : 
-        return text.encode("UTF-8", "replace")
+        return text.encode("UTF-8")
     else :    
         return None
@@ -101 +107 @@
 def logerr(text) :
     """Logs an unicode text to stderr."""
-    sys.stderr.write(text.encode(sys.stdout.encoding or locale.getlocale()[1], \
+    sys.stderr.write(text.encode(sys.stdout.encoding \
+                                     or locale.getlocale()[1] \
+                                     or "ANSI_X3.4-1968", \
                                  "replace"))
     sys.stderr.flush()

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 """This module defines some application level constants."""
 
-__version__ = "1.27alpha3_BROKEN_unofficial"
+__version__ = "1.27alpha4_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."