head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1;
locks; strict;
comment	@# @;


1.1
date	2010.10.12.06.21.13;	author pgollucci;	state Exp;
branches;
next	;


desc
@@


1.1
log
@The AnnouncerPlugin is meant to provide an extensible,
user-customizable notification system that can be used
to completely replace Trac's default notifications.

WWW: http://trac-hacks.org/wiki/AnnouncertPlugin

PR:		ports/150484
Submitted by:	Eygene Ryabinkin <rea-fbsd at codelabs.ru>
@
text
@--- announcer/util/mail.py.orig	2010-09-10 21:05:17.000000000 +0400
+++ announcer/util/mail.py	2010-09-10 21:07:34.000000000 +0400
@@@@ -48,7 +48,11 @@@@
 def set_header(message, key, value, charset=None):
     if not charset:
         charset = message.get_charset() or 'ascii'
-    value = Header(value, charset, MAXHEADERLEN-(len(key)+2))
+    # Don't encode pure ASCII headers.
+    try:
+        value = Header(value, 'ascii', MAXHEADERLEN-(len(key)+2))
+    except:
+        value = Header(value, charset, MAXHEADERLEN-(len(key)+2))
     if message.has_key(key):
         message.replace_header(key, value)
     else:
@
