Changeset 3429

Timestamp:

10/05/08 11:21:53 (16 years ago)

Author:

jerome

Message:

Changed the way informations are output, especially to replace 'print'
statements which won't exist anymore in Python 3.

Location:

pykota/trunk

Files:

• bin/pkinvoice (modified) (1 diff)
• bin/pkrefund (modified) (2 diffs)
• bin/pkturnkey (modified) (2 diffs)
• bin/repykota (modified) (1 diff)
• pykota/tool.py (modified) (3 diffs)

pykota/trunk/bin/pkinvoice

@@ -264 +264 @@
         if outfname != "-" :
             nbusers = len(peruser)
-            print _("Invoiced %(nbusers)i users for %(nbjobs)i jobs, %(nbpages)i pages and %(nbcredits).3f credits") \
-                     % locals()
+            self.display("%s\n" % (_("Invoiced %(nbusers)i users for %(nbjobs)i jobs, %(nbpages)i pages and %(nbcredits).3f credits") \
+                     % locals()))
 
 if __name__ == "__main__" :

pykota/trunk/bin/pkrefund

@@ -257 +257 @@
                         percent.oneMore()
                 else :
-                    print _("Date : %s") % str(job.JobDate)[:19]
-                    print _("Printer : %s") % job.PrinterName
-                    print _("User : %s") % job.UserName
-                    print _("JobId : %s") % job.JobId
-                    print _("Title : %s") % job.JobTitle
+                    self.display("%s\n" % (_("Date : %s") % str(job.JobDate)[:19]))
+                    self.display("%s\n" % (_("Printer : %s") % job.PrinterName))
+                    self.display("%s\n" % (_("User : %s") % job.UserName))
+                    self.display("%s\n" % (_("JobId : %s") % job.JobId))
+                    self.display("%s\n" % (_("Title : %s") % job.JobTitle))
                     if job.JobBillingCode :
-                        print _("Billing code : %s") % job.JobBillingCode
-                    print _("Pages : %i") % job.JobSize
-                    print _("Credits : %.3f") % job.JobPrice
+                        self.display("%s\n" % (_("Billing code : %s") % job.JobBillingCode))
+                    self.display("%s\n" % (_("Pages : %i") % job.JobSize))
+                    self.display("%s\n" % (_("Credits : %.3f") % job.JobPrice))
 
                     while True :
@@ -292 +292 @@
         if outfname != "-" :
             nbusers = len(peruser)
-            print _("Refunded %(nbusers)i users for %(nbjobs)i jobs, %(nbpages)i pages and %(nbcredits).3f credits") \
-                     % locals()
+            self.display("%s\n" % (_("Refunded %(nbusers)i users for %(nbjobs)i jobs, %(nbpages)i pages and %(nbcredits).3f credits") \
+                     % locals()))
 
 if __name__ == "__main__" :

pykota/trunk/bin/pkturnkey

@@ -331 +331 @@
             return
         sys.stderr.flush() # ensure outputs don't mix
-        print
-        print "--- CUT ---"
-        print "# Here are some lines that we suggest you add at the end"
-        print "# of the pykota.conf file. These lines gives possible"
-        print "# values for the way print jobs' size will be computed."
-        print "# NB : it is possible that a manual configuration gives"
-        print "# better results for you. As always, your mileage may vary."
-        print "#"
+        self.display("\n--- CUT ---\n")
+        self.display("# Here are some lines that we suggest you add at the end\n")
+        self.display("# of the pykota.conf file. These lines gives possible\n")
+        self.display("# values for the way print jobs' size will be computed.\n")
+        self.display("# NB : it is possible that a manual configuration gives\n")
+        self.display("# better results for you. As always, your mileage may vary.\n")
+        self.display("#\n")
         for (name, uri) in printers :
-            print "[%s]" % name
+            self.display("[%s]\n" % name)
             accounter = "software()"
             try :
@@ -380 +379 @@
                         accounter = "hardware(pjl:%s)" % port
 
-            print "preaccounter : software()"
-            print "accounter : %s" % accounter
-            print
-        print "--- CUT ---"
+            self.display("preaccounter : software()\n")
+            self.display("accounter : %s\n" % accounter)
+            self.display("\n")
+        self.display("--- CUT ---\n")
 
     def main(self, names, options) :

pykota/trunk/bin/repykota

@@ -81 +81 @@
 
         self.reportingtool = reporter.openReporter(self, "text", printers, ugnames, options.groups)
-        print self.reportingtool.generateReport()
+        self.display(self.reportingtool.generateReport())
 
 if __name__ == "__main__" :

pykota/trunk/pykota/tool.py

@@ -47 +47 @@
     def __init__(self, app, size=None) :
         """Initializes the engine."""
+        self.isatty = sys.stdout.isatty()
         self.app = app
         self.size = None
@@ -63 +64 @@
     def display(self, msg) :
         """Displays the value."""
-        self.app.display(msg)
+        if self.isatty :
+            self.app.display(msg)
+            sys.stdout.flush()
 
     def oneMore(self) :
@@ -151 +154 @@
 
     def display(self, message) :
-        """Display a message but only if stdout is a tty."""
-        if sys.stdout.isatty() :
-            sys.stdout.write(message.encode(self.charset, \
+        """Display a message after ensuring the correct charset is used."""
+        sys.stdout.write(message.encode(self.charset,
                                             "replace"))
-            sys.stdout.flush()
 
     def logdebug(self, message) :