Changeset 1777
- Timestamp:
- 10/05/04 11:59:20 (20 years ago)
- Location:
- pykota/trunk
- Files:
-
- 3 modified
-
bin/dumpykota (modified) (2 diffs)
-
pykota/storages/ldapstorage.py (modified) (7 diffs)
-
pykota/storages/sql.py (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/dumpykota
r1771 r1777 24 24 # 25 25 # $Log$ 26 # Revision 1.8 2004/10/05 09:59:19 jalet 27 # Restore compatibility with Python 2.1 28 # 26 29 # Revision 1.7 2004/10/04 21:25:29 jalet 27 30 # dumpykota can now output datas in the XML format … … 218 221 for i in range(len(entry)) : 219 222 value = entry[i] 220 strvalue = str(value).decode(self.getCharset()).encode("UTF-8")223 strvalue = unicode(str(value), self.getCharset()).encode("UTF-8") 221 224 x.attribute(strvalue, type=type(value).__name__, name=headers[i]) 222 225 x._pop() -
pykota/trunk/pykota/storages/ldapstorage.py
r1768 r1777 22 22 # 23 23 # $Log$ 24 # Revision 1.82 2004/10/05 09:59:20 jalet 25 # Restore compatibility with Python 2.1 26 # 24 27 # Revision 1.81 2004/10/04 11:27:57 jalet 25 28 # Finished LDAP support for dumpykota. … … 589 592 printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0] or 0.0) 590 593 printer.uniqueMember = fields.get("uniqueMember", []) 591 printer.Description = fields.get("description", [""])[0].decode("UTF-8").encode(self.tool.getCharset())594 printer.Description = unicode(fields.get("description", [""])[0], "UTF-8").encode(self.tool.getCharset()) 592 595 printer.Exists = 1 593 596 return printer … … 690 693 lastjob.JobPrice = None 691 694 lastjob.JobAction = fields.get("pykotaAction", [""])[0] 692 lastjob.JobFileName = fields.get("pykotaFileName", [""])[0].decode("UTF-8").encode(self.tool.getCharset())693 lastjob.JobTitle = fields.get("pykotaTitle", [""])[0].decode("UTF-8").encode(self.tool.getCharset())695 lastjob.JobFileName = unicode(fields.get("pykotaFileName", [""])[0], "UTF-8").encode(self.tool.getCharset()) 696 lastjob.JobTitle = unicode(fields.get("pykotaTitle", [""])[0], "UTF-8").encode(self.tool.getCharset()) 694 697 lastjob.JobCopies = int(fields.get("pykotaCopies", [0])[0]) 695 lastjob.JobOptions = fields.get("pykotaOptions", [""])[0].decode("UTF-8").encode(self.tool.getCharset())698 lastjob.JobOptions = unicode(fields.get("pykotaOptions", [""])[0], "UTF-8").encode(self.tool.getCharset()) 696 699 lastjob.JobHostName = fields.get("pykotaHostName", [""])[0] 697 700 lastjob.JobSizeBytes = fields.get("pykotaJobSizeBytes", [0L])[0] … … 766 769 printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0] or 0.0) 767 770 printer.uniqueMember = fields.get("uniqueMember", []) 768 printer.Description = fields.get("description", [""])[0].decode("UTF-8").encode(self.tool.getCharset())771 printer.Description = unicode(fields.get("description", [""])[0], "UTF-8").encode(self.tool.getCharset()) 769 772 printer.Exists = 1 770 773 printers.append(printer) … … 978 981 """Write the printer's description back into the storage.""" 979 982 fields = { 980 "description" : str(printer.Description).decode(self.tool.getCharset()).encode("UTF-8"),983 "description" : unicode(str(printer.Description), self.tool.getCharset()).encode("UTF-8"), 981 984 } 982 985 self.doModify(printer.ident, fields) … … 1077 1080 "pykotaPrinterPageCounter" : str(pagecounter), 1078 1081 "pykotaAction" : action, 1079 "pykotaFileName" : ((filename is None) and "None") or filename.decode(self.tool.getCharset()).encode("UTF-8"),1080 "pykotaTitle" : ((title is None) and "None") or title.decode(self.tool.getCharset()).encode("UTF-8"),1082 "pykotaFileName" : ((filename is None) and "None") or unicode(filename, self.tool.getCharset()).encode("UTF-8"), 1083 "pykotaTitle" : ((title is None) and "None") or unicode(title, self.tool.getCharset()).encode("UTF-8"), 1081 1084 "pykotaCopies" : str(copies), 1082 "pykotaOptions" : ((options is None) and "None") or options.decode(self.tool.getCharset()).encode("UTF-8"),1085 "pykotaOptions" : ((options is None) and "None") or unicode(options, self.tool.getCharset()).encode("UTF-8"), 1083 1086 "pykotaHostName" : str(clienthost), 1084 1087 "pykotaJobSizeBytes" : str(jobsizebytes), … … 1179 1182 job.JobPrice = None 1180 1183 job.JobAction = fields.get("pykotaAction", [""])[0] 1181 job.JobFileName = fields.get("pykotaFileName", [""])[0].decode("UTF-8").encode(self.tool.getCharset())1182 job.JobTitle = fields.get("pykotaTitle", [""])[0].decode("UTF-8").encode(self.tool.getCharset())1184 job.JobFileName = unicode(fields.get("pykotaFileName", [""])[0], "UTF-8").encode(self.tool.getCharset()) 1185 job.JobTitle = unicode(fields.get("pykotaTitle", [""])[0], "UTF-8").encode(self.tool.getCharset()) 1183 1186 job.JobCopies = int(fields.get("pykotaCopies", [0])[0]) 1184 job.JobOptions = fields.get("pykotaOptions", [""])[0].decode("UTF-8").encode(self.tool.getCharset())1187 job.JobOptions = unicode(fields.get("pykotaOptions", [""])[0], "UTF-8").encode(self.tool.getCharset()) 1185 1188 job.JobHostName = fields.get("pykotaHostName", [""])[0] 1186 1189 job.JobSizeBytes = fields.get("pykotaJobSizeBytes", [0L])[0] -
pykota/trunk/pykota/storages/sql.py
r1773 r1777 22 22 # 23 23 # $Log$ 24 # Revision 1.53 2004/10/05 09:59:20 jalet 25 # Restore compatibility with Python 2.1 26 # 24 27 # Revision 1.52 2004/10/04 22:23:54 jalet 25 28 # Charset conversions for dumps from the PostgreSQL backend … … 106 109 if type(field) == StringType : 107 110 try : 108 fields[j] = field.decode("UTF-8").encode(self.tool.getCharset())111 fields[j] = unicode(field, "UTF-8").encode(self.tool.getCharset()) 109 112 except UnicodeEncodeError : # takes care of old jobs in history not stored as UTF-8 110 113 pass … … 212 215 printer.PricePerJob = fields.get("priceperjob") or 0.0 213 216 printer.PricePerPage = fields.get("priceperpage") or 0.0 214 printer.Description = (fields.get("description") or "").decode("UTF-8").encode(self.tool.getCharset())217 printer.Description = unicode((fields.get("description") or ""), "UTF-8").encode(self.tool.getCharset()) 215 218 printer.Exists = 1 216 219 return printer … … 261 264 lastjob.JobPrice = fields.get("jobprice") 262 265 lastjob.JobAction = fields.get("action") 263 lastjob.JobFileName = (fields.get("filename") or "").decode("UTF-8").encode(self.tool.getCharset())264 lastjob.JobTitle = (fields.get("title") or "").decode("UTF-8").encode(self.tool.getCharset())266 lastjob.JobFileName = unicode((fields.get("filename") or ""), "UTF-8").encode(self.tool.getCharset()) 267 lastjob.JobTitle = unicode((fields.get("title") or ""), "UTF-8").encode(self.tool.getCharset()) 265 268 lastjob.JobCopies = fields.get("copies") 266 lastjob.JobOptions = (fields.get("options") or "").decode("UTF-8").encode(self.tool.getCharset())269 lastjob.JobOptions = unicode((fields.get("options") or ""), "UTF-8").encode(self.tool.getCharset()) 267 270 lastjob.JobDate = fields.get("jobdate") 268 271 lastjob.JobHostName = fields.get("hostname") … … 323 326 printer.PricePerJob = record.get("priceperjob") or 0.0 324 327 printer.PricePerPage = record.get("priceperpage") or 0.0 325 printer.Description = (record.get("description") or "").decode("UTF-8").encode(self.tool.getCharset())328 printer.Description = unicode((record.get("description") or ""), "UTF-8").encode(self.tool.getCharset()) 326 329 printer.Exists = 1 327 330 printers.append(printer) … … 411 414 description = printer.Description 412 415 if description is not None : 413 description = printer.Description.decode(self.tool.getCharset()).encode("UTF-8"),416 description = unicode(printer.Description, self.tool.getCharset()).encode("UTF-8"), 414 417 self.doModify("UPDATE printers SET description=%s WHERE id=%s" % (self.doQuote(description), self.doQuote(printer.ident))) 415 418 … … 460 463 """Adds a job in a printer's history.""" 461 464 if filename is not None : 462 filename = filename.decode(self.tool.getCharset()).encode("UTF-8")465 filename = unicode(filename, self.tool.getCharset()).encode("UTF-8") 463 466 if title is not None : 464 title = title.decode(self.tool.getCharset()).encode("UTF-8")467 title = unicode(title, self.tool.getCharset()).encode("UTF-8") 465 468 if options is not None : 466 options = options.decode(self.tool.getCharset()).encode("UTF-8")469 options = unicode(options, self.tool.getCharset()).encode("UTF-8") 467 470 if (not self.disablehistory) or (not printer.LastJob.Exists) : 468 471 if jobsize is not None : … … 524 527 job.JobPrice = fields.get("jobprice") 525 528 job.JobAction = fields.get("action") 526 job.JobFileName = (fields.get("filename") or "").decode("UTF-8").encode(self.tool.getCharset())527 job.JobTitle = (fields.get("title") or "").decode("UTF-8").encode(self.tool.getCharset())529 job.JobFileName = unicode((fields.get("filename") or ""), "UTF-8").encode(self.tool.getCharset()) 530 job.JobTitle = unicode((fields.get("title") or ""), "UTF-8").encode(self.tool.getCharset()) 528 531 job.JobCopies = fields.get("copies") 529 job.JobOptions = (fields.get("options") or "").decode("UTF-8").encode(self.tool.getCharset())532 job.JobOptions = unicode((fields.get("options") or ""), "UTF-8").encode(self.tool.getCharset()) 530 533 job.JobDate = fields.get("jobdate") 531 534 job.JobHostName = fields.get("hostname")
