formatdate(): The calculation of the minutes part of the zone was

incorrect for "uneven" timezones.  This algorithm should work for even
timezones (e.g. America/New_York) and uneven timezones (e.g.
Australia/Adelaide and America/St_Johns).

Closes SF bug #483231.

diff --git a/Lib/email/Utils.py b/Lib/email/Utils.py
index 58fd8da6bb5e7e0463eec5fbe237462b1c329232..8d46096fdfabfeed6e21ab15a53baa7698419458 100644 (file)
--- a/Lib/email/Utils.py
+++ b/Lib/email/Utils.py
@@ -130,7 +130,8 @@ def formatdate(timeval=None, localtime=0):
             offset = time.altzone
         else:
             offset = time.timezone
-        zone = '%+03d%02d' % (offset / -3600, offset % 60)
+        hours, minutes = divmod(offset, -3600)
+        zone = '%+03d%02d' % (hours, minutes / -60)
     else:
         now = time.gmtime(timeval)
         # Timezone offset is always -0000