Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28539

Modified Files:
        i18n.py 
Log Message:
Improved fix for bug 1433673.  When time.strptime returns tm_isdst = -1, use
time.localtime(time.mktime()) to try again.



Index: i18n.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/i18n.py,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -d -r2.14 -r2.15
--- i18n.py     19 Feb 2006 21:09:02 -0000      2.14
+++ i18n.py     23 Feb 2006 06:25:47 -0000      2.15
@@ -110,6 +110,10 @@
             year, mon, day, hh, mm, ss, wday, ydat, dst = time.strptime(date)
             if dst in (0,1):
                 tzname = time.tzname[dst]
+            else:
+                # MAS: No exception but dst = -1 so try
+                return ctime(time.mktime((year, mon, day, hh, mm, ss, wday,
+                                          ydat, dst)))
         except (ValueError, AttributeError):
             try:
                 wday, mon, day, hms, year = date.split()

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to