Changeset 3464

Timestamp:

12/07/08 21:49:04 (16 years ago)

Author:

jerome

Message:

Added proper encoding to fix #35.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• bin/warnpykota (modified) (2 diffs)
• pykota/tool.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -942 +942 @@
                 else :
                     try :
-                        msg = MIMEText(fullmessage, _charset=self.charset)
-                        msg["Subject"] = Header(_("Print Quota"), charset=self.charset, errors="replace")
+                        msg = MIMEText(fullmessage.encode(self.charset,
+                                                          "replace"),
+                                       _charset=self.charset)
+                        subject = _("Print Quota")
+                        msg["Subject"] = Header(subject.encode(self.charset, "replace"),
+                                                charset=self.charset,
+                                                errors="replace")
                         msg["From"] = adminmail
                         if mailto in ("BOTH", "USER") :

pykota/trunk/bin/warnpykota

@@ -71 +71 @@
             usermail = "%s@%s" % (usermail, self.maildomain or self.smtpserver or "localhost")
         msg = MIMEText(message.encode(self.charset, "replace"), _charset=self.charset)
-        msg["Subject"] = Header(subject, charset=self.charset)
+        msg["Subject"] = Header(subject.encode(self.charset, "replace"), charset=self.charset)
         msg["From"] = adminmail
         msg["To"] = usermail
@@ -82 +82 @@
             adminmail = "%s@%s" % (adminmail, self.maildomain or self.smtpserver or "localhost")
         msg = MIMEText(message.encode(self.charset, "replace"), _charset=self.charset)
-        msg["Subject"] = Header(subject, charset=self.charset)
+        msg["Subject"] = Header(subject.encode(self.charset, "replace"), charset=self.charset)
         msg["From"] = adminmail
         msg["To"] = adminmail

pykota/trunk/pykota/tool.py

@@ -486 +486 @@
     def externalMailTo(self, cmd, action, user, printer, message) :
         """Warns the user with an external command."""
+        message = message.encode(self.charset, "replace")
         username = user.Name
         printername = printer.Name