Changeset 2879

Timestamp:

05/03/06 20:40:18 (18 years ago)

Author:

jerome

Message:

Fixes a datetime encoding problem.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• cgi-bin/printquota.cgi (modified) (1 diff)
• pykota/dumper.py (modified) (1 diff)
• pykota/reporter.py (modified) (1 diff)
• pykota/tool.py (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -803 +803 @@
                 now = DateTime.now()
                 try :
-                    previous = DateTime.ISO.ParseDateTime(self.Printer.LastJob.JobDate).localtime()
+                    previous = DateTime.ISO.ParseDateTime(str(self.Printer.LastJob.JobDate)).localtime()
                 except :
                     previous = now

pykota/trunk/cgi-bin/printquota.cgi

@@ -264 +264 @@
                                                             job.JobPages)])))
                     self.report.append('</table>')
-                    d = DateTime.ISO.ParseDateTime(job.JobDate)       
+                    d = DateTime.ISO.ParseDateTime(str(job.JobDate))
                     dico = { "history" : 1,
                              "datelimit" : "%04i%02i%02i %02i:%02i:%02i" % (d.year, d.month, d.day, d.hour, d.minute, d.second),

pykota/trunk/pykota/dumper.py

@@ -254 +254 @@
             username = entry[fields["username"]]
             jobid = entry[fields["jobid"]]
-            jobdate = DateTime.ISO.ParseDateTime(entry[fields["jobdate"]])
+            jobdate = DateTime.ISO.ParseDateTime(str(entry[fields["jobdate"]]))
             gmtoffset = jobdate.gmtoffset()
             jobdate = "%s %+03i00" % (jobdate.strftime("%d/%b/%Y:%H:%M:%S"), gmtoffset.hour)

pykota/trunk/pykota/reporter.py

@@ -92 +92 @@
             elif quota.DateLimit is not None :
                 now = DateTime.now()
-                datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
+                datelimit = DateTime.ISO.ParseDateTime(str(quota.DateLimit))
                 if now >= datelimit :
                     datelimit = "DENY"

pykota/trunk/pykota/tool.py

@@ -524 +524 @@
                             now = DateTime.now()
                             if userpquota.DateLimit is not None :
-                                datelimit = DateTime.ISO.ParseDateTime(userpquota.DateLimit)
+                                datelimit = DateTime.ISO.ParseDateTime(str(userpquota.DateLimit))
                             else :
                                 datelimit = now + self.config.getGraceDelay(printer.Name)
@@ -583 +583 @@
                             now = DateTime.now()
                             if grouppquota.DateLimit is not None :
-                                datelimit = DateTime.ISO.ParseDateTime(grouppquota.DateLimit)
+                                datelimit = DateTime.ISO.ParseDateTime(str(grouppquota.DateLimit))
                             else :
                                 datelimit = now + self.config.getGraceDelay(printer.Name)