- Timestamp:
- 12/07/08 21:49:04 (16 years ago)
- Location:
- pykota/trunk
- Files:
-
- 3 modified
-
bin/cupspykota (modified) (1 diff)
-
bin/warnpykota (modified) (2 diffs)
-
pykota/tool.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/cupspykota
r3463 r3464 942 942 else : 943 943 try : 944 msg = MIMEText(fullmessage, _charset=self.charset) 945 msg["Subject"] = Header(_("Print Quota"), charset=self.charset, errors="replace") 944 msg = MIMEText(fullmessage.encode(self.charset, 945 "replace"), 946 _charset=self.charset) 947 subject = _("Print Quota") 948 msg["Subject"] = Header(subject.encode(self.charset, "replace"), 949 charset=self.charset, 950 errors="replace") 946 951 msg["From"] = adminmail 947 952 if mailto in ("BOTH", "USER") : -
pykota/trunk/bin/warnpykota
r3413 r3464 71 71 usermail = "%s@%s" % (usermail, self.maildomain or self.smtpserver or "localhost") 72 72 msg = MIMEText(message.encode(self.charset, "replace"), _charset=self.charset) 73 msg["Subject"] = Header(subject , charset=self.charset)73 msg["Subject"] = Header(subject.encode(self.charset, "replace"), charset=self.charset) 74 74 msg["From"] = adminmail 75 75 msg["To"] = usermail … … 82 82 adminmail = "%s@%s" % (adminmail, self.maildomain or self.smtpserver or "localhost") 83 83 msg = MIMEText(message.encode(self.charset, "replace"), _charset=self.charset) 84 msg["Subject"] = Header(subject , charset=self.charset)84 msg["Subject"] = Header(subject.encode(self.charset, "replace"), charset=self.charset) 85 85 msg["From"] = adminmail 86 86 msg["To"] = adminmail -
pykota/trunk/pykota/tool.py
r3434 r3464 486 486 def externalMailTo(self, cmd, action, user, printer, message) : 487 487 """Warns the user with an external command.""" 488 message = message.encode(self.charset, "replace") 488 489 username = user.Name 489 490 printername = printer.Name
