merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -11,6 +11,7 @@ Fixed:
 - fix some security assertions (sf bug 1085481) (see doc/upgrading.txt for
   notes)
 - don't set the title to nothing from incoming mail (thanks Bruce Guenter)
+- fix py2.4 strftime() API change bug (sf bug 1087746)
 
 
 2004-10-26 0.7.9

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: date.py,v 1.68.2.4 2004-10-08 00:34:58 richard Exp $
+# $Id: date.py,v 1.68.2.5 2005-01-03 03:08:37 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -361,8 +361,14 @@ def pretty(self, format='%d %B %Y'):
             Note that if the day is zero, and the day appears first in the
             format, then the day number will be removed from output.
         '''
-        str = time.strftime(format, (self.year, self.month, self.day,
-            self.hour, self.minute, int(self.second), 0, 0, 0))
+        # Python2.4 strftime() enforces the non-zero-ness of the day-of-year
+        # component of the time tuple, so we need to figure it out
+        t = (self.year, self.month, self.day, self.hour, self.minute,
+            int(self.second), 0, 0, 0)
+        t = calendar.timegm(t)
+        t = time.gmtime(t)
+        str = time.strftime(format, t)
+
         # handle zero day by removing it
         if format.startswith('%d') and str[0] == '0':
             return ' ' + str[1:]