bodewig 2004/03/05 00:31:32
Modified: project logging-log4j-12.xml logging-log4j.xml
python/gump/net mailer.py
Log:
Revert nag mail change and remove Ceki's full name until we've found a proper way to
encode it
Revision Changes Path
1.2 +4 -1 gump/project/logging-log4j-12.xml
Index: logging-log4j-12.xml
===================================================================
RCS file: /home/cvs/gump/project/logging-log4j-12.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logging-log4j-12.xml 27 Feb 2004 13:33:56 -0000 1.1
+++ logging-log4j-12.xml 5 Mar 2004 08:31:31 -0000 1.2
@@ -41,9 +41,12 @@
<!--home nested="dist"/-->
<jar name="dist/lib/log4j-@@DATE@@.jar"/>
+ <!--nag to="[EMAIL PROTECTED]"
+ subject="Build Failure 1.2 branch"
+ from="Ceki G�lc� <[EMAIL PROTECTED]>"/-->
<nag to="[EMAIL PROTECTED]"
subject="Build Failure 1.2 branch"
- from="Ceki G�lc� <[EMAIL PROTECTED]>"/>
+ from="<[EMAIL PROTECTED]>"/>
</project>
<!-- disable until it can work on JDK 1.4
1.2 +7 -2 gump/project/logging-log4j.xml
Index: logging-log4j.xml
===================================================================
RCS file: /home/cvs/gump/project/logging-log4j.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logging-log4j.xml 27 Feb 2004 13:33:56 -0000 1.1
+++ logging-log4j.xml 5 Mar 2004 08:31:32 -0000 1.2
@@ -46,8 +46,10 @@
<jar name="log4j-lf5-@@DATE@@.jar" id="lf5"/>
<jar name="log4j-chainsaw-@@DATE@@.jar" id="chainsaw"/>
+ <!--nag to="[EMAIL PROTECTED]"
+ from="Ceki G�lc� <[EMAIL PROTECTED]>"/-->
<nag to="[EMAIL PROTECTED]"
- from="Ceki G�lc� <[EMAIL PROTECTED]>"/>
+ from="<[EMAIL PROTECTED]>"/>
</project>
<project name="log4j-tests">
@@ -67,8 +69,11 @@
<work nested="tests/resources" />
<work nested="examples/classes"/>
+ <!--nag to="[EMAIL PROTECTED]"
+ subject="Test Failure"
+ from="Ceki G�lc� <[EMAIL PROTECTED]>"/-->
<nag to="[EMAIL PROTECTED]"
subject="Test Failure"
- from="Ceki G�lc� <[EMAIL PROTECTED]>"/>
+ from="<[EMAIL PROTECTED]>"/>
</project>
</module>
1.10 +11 -7 gump/python/gump/net/mailer.py
Index: mailer.py
===================================================================
RCS file: /home/cvs/gump/python/gump/net/mailer.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mailer.py 4 Mar 2004 17:54:18 -0000 1.9
+++ mailer.py 5 Mar 2004 08:31:32 -0000 1.10
@@ -82,8 +82,10 @@
# The text of the message (the main bodypart)
def __init__(self,toaddrs,fromaddr,subject,text,signature=None):
self.toaddrs = toaddrs
- self.fromaddr = Header(fromaddr, 'iso-8859-1')
- self.subject = Header(subject, 'iso-8859-1')
+ #self.fromaddr = Header(fromaddr, 'iso-8859-1')
+ self.fromaddr = fromaddr
+ #self.subject = Header(subject, 'iso-8859-1')
+ self.subject = subject
self.text=text
# The signature
@@ -101,9 +103,11 @@
# Add the From: and To: headers at the start!
data = ("Date: %s\r\nFrom: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%s%s"
% ( time.strftime('%d %b %y %H:%M:%S', time.gmtime()),
- self.fromaddr.encode(),
+ #self.fromaddr.encode(),
+ self.fromaddr,
string.join(self.toaddrs, ", "),
- self.subject.encode(),
+ #self.subject.encode(),
+ self.subject,
self.text,
default.signature))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
