Patch #791776: Replace SMTPHandler.date_time with email.Utils.formatdate.

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index d9de952466ce87645dee31e707f8244372af1170..2cb1fb07c332204643ccebef7ee4a593eff9611a 100644 (file)
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -654,21 +654,6 @@ class SMTPHandler(logging.Handler):
         """
         return self.subject
 
-    weekdayname = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-
-    monthname = [None,
-                 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-                 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-    def date_time(self):
-        """Return the current date and time formatted for a MIME header."""
-        year, month, day, hh, mm, ss, wd, y, z = time.gmtime(time.time())
-        s = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % (
-                self.weekdayname[wd],
-                day, self.monthname[month], year,
-                hh, mm, ss)
-        return s
-
     def emit(self, record):
         """
         Emit a record.
@@ -677,6 +662,7 @@ class SMTPHandler(logging.Handler):
         """
         try:
             import smtplib
+            from email.Utils import formatdate
             port = self.mailport
             if not port:
                 port = smtplib.SMTP_PORT
@@ -686,7 +672,7 @@ class SMTPHandler(logging.Handler):
                             self.fromaddr,
                             string.join(self.toaddrs, ","),
                             self.getSubject(record),
-                            self.date_time(), msg)
+                            formatdate(), msg)
             smtp.sendmail(self.fromaddr, self.toaddrs, msg)
             smtp.quit()
         except:

diff --git a/Misc/NEWS b/Misc/NEWS
index eaf6655ddd082f2965dcfea3375d0611d2bdf9b2..f5b2034750553c04104ecedafc9f077d2bc8847c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,9 @@ Extension modules
 Library
 -------
 
+- logging.handlers.SMTPHandler.date_time has been removed;
+  the class now uses email.Utils.formatdate to generate the time stamp.
+
 - A new function tkFont.nametofont was added to return an existing
   font. The Font class constructor now has an additional exists argument
   which, if True, requests to return/configure an existing font, rather