diff options
| author | Sebastian Reichel <sre@ring0.de> | 2013-02-23 21:31:24 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2013-02-23 21:31:24 +0100 |
| commit | b388bbd8f9e4363830d971046a9f256b963056c3 (patch) | |
| tree | 2c2fe673fda0bcdeb47d350a67d0f928cc9588ca | |
| parent | e4edc7e3f093333f65702e4b547930f0cb4e57a7 (diff) | |
| download | serial-barcode-scanner-b388bbd8f9e4363830d971046a9f256b963056c3.tar.bz2 | |
fix unicode in receiver
| -rwxr-xr-x | invoice/generate-invoice.py | 8 | ||||
| -rw-r--r-- | invoice/mailhelper.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/invoice/generate-invoice.py b/invoice/generate-invoice.py index e152c8b..5eb4aff 100755 --- a/invoice/generate-invoice.py +++ b/invoice/generate-invoice.py @@ -182,7 +182,7 @@ def daily(timestamp = time.time()): for user in db.get_users_with_purchases(start, stop): userinfo = db.get_user_info(user) if userinfo is not None: - receiver = "%s %s <%s>" % (userinfo["firstname"], userinfo["lastname"], userinfo["email"]) + receiver = ("%s %s" % (userinfo["firstname"], userinfo["lastname"]), userinfo["email"]) msg = generate_invoice_text(user, title, subject, start, stop, True) mail = mailer.generate_mail(receiver, title, msg, None, timestamp) mailer.send_mail(mail, userinfo["email"]) @@ -206,7 +206,7 @@ def monthly(timestamp = time.time()): subject = "Rechnung Nr. %04d%02d5%03d" % (dstart.year, dstart.month, number) userinfo = db.get_user_info(user) if userinfo is not None: - receiver = "%s %s <%s>" % (userinfo["firstname"], userinfo["lastname"], userinfo["email"]) + receiver = ("%s %s" % (userinfo["firstname"], userinfo["lastname"]), userinfo["email"]) tex = generate_invoice_tex(user, title, subject, start, stop, False) msg = generate_invoice_text(user, title, subject, start, stop, False) pdf = generate_pdf(tex) @@ -224,7 +224,7 @@ def monthly(timestamp = time.time()): csvinvoicedata += "%d,%s,%s,%s,%d.%02d\n" % (entry["userid"], entry["lastname"], entry["firstname"], entry["invoiceid"], entry["amount"] / 100, entry["amount"] % 100) invoices["invoicedata.csv"] = csvinvoicedata - mail = mailer.generate_mail("Schatzmeister <schatzmeister@kreativitaet-trifft-technik.de>", + mail = mailer.generate_mail(("Schatzmeister", "schatzmeister@kreativitaet-trifft-technik.de"), "Rechnungen %04d%02d" % (dstart.year, dstart.month), None, invoices, timestamp) mailer.send_mail(mail, "schatzmeister@kreativitaet-trifft-technik.de") @@ -233,7 +233,7 @@ def backup(): timestamp = time.time() dt = datetime.datetime.fromtimestamp(timestamp) - receiver="KtT-Shopsystem Backups <shop-backup@kreativitaet-trifft-technik.de>" + receiver=("KtT-Shopsystem Backups", "shop-backup@kreativitaet-trifft-technik.de") subject="Backup KtT-Shopsystem %04d-%02d-%02d %02d:%02d" % (dt.year, dt.month, dt.day, dt.hour, dt.minute) message="You can find a backup of 'shop.db' attached to this mail." dbfile = open('shop.db', 'rb') diff --git a/invoice/mailhelper.py b/invoice/mailhelper.py index 3beb4c7..0da8cd8 100644 --- a/invoice/mailhelper.py +++ b/invoice/mailhelper.py @@ -21,10 +21,10 @@ class MAIL(object): msg["Date"] = email.utils.formatdate(timestamp, True) try: - if receiver.encode("ascii"): - msg["To"] = receiver + if receiver[0].encode("ascii"): + msg["To"] = receiver[0] + " <" + receiver[1] + ">" except UnicodeError: - msg["To"] = Header(receiver, 'utf-8') + msg["To"] = Header(receiver[0], 'utf-8') + " <" + receiver[1] + ">" if cc != None: msg["Cc"] = cc |