Ticket #2633: tmp_fix.diff

django/utils/dateformat.py

@@ -165 +165 @@
     def O(self):
         "Difference to Greenwich time in hours; e.g. '+0200'"
         tz = self.timezone.utcoffset(self.data)
-        return "%+03d%02d" % (tz.seconds // 3600, (tz.seconds // 60) % 60)
+        seconds = tz.days * 86400 + tz.seconds
+        return "%+03d%02d" % (seconds // 3600, (seconds // 60) % 60)
 
     def r(self):
         "RFC 822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
@@ -198 +199 @@
     def U(self):
         "Seconds since the Unix epoch (January 1 1970 00:00:00 GMT)"
         off = self.timezone.utcoffset(self.data)
-        return int(time.mktime(self.data.timetuple())) + off.seconds * 60
+        seconds = off.days * 86400 + off.seconds
+        return int(time.mktime(self.data.timetuple())) + seconds * 60
 
     def w(self):
         "Day of the week, numeric, i.e. '0' (Sunday) to '6' (Saturday)"
@@ -249 +251 @@
         """Time zone offset in seconds (i.e. '-43200' to '43200'). The offset
         for timezones west of UTC is always negative, and for those east of UTC
         is always positive."""
-        return self.timezone.utcoffset(self.data).seconds
+        off = self.timezone.utcoffset(self.data)
+        return off.days * 86400 + off.seconds
 
 def format(value, format_string):
     "Convenience function"