issue2117897: Fixed two more rounding to 60.0 seconds in date.py

This caused exceptions in real-world data as reported in the issue by
Kenny Johansson, Malte Helmert and me. Change them to 59.999 as was done
in the fix for issue2550802.

Author: ThomasAH

CHANGES.txt

@@ -3,7 +3,7 @@ Entries are given with the most recent entry first.
 Each entry has the developer who committed the change in brackets.
 Entries without name were done by Richard Jones.
 
-2013-??-??: 1.5.1
+2014-??-??: 1.5.1
 
 Features:
 
@@ -55,6 +55,9 @@ Fixed:
   necessary changes to your templates, the escaping now happens in the
   template and not in the roundup code. So if you don't make the
   necessary changes *you are vulnerable*. (Ralf Schlatterbeck)
+- issue2117897: Fixed two more places in date.py where seconds can be
+  rounded to 60.0 and causing exceptions. Change them to 59.999 as was
+  done in the fix for issue2550802. (Thomas Arendsen Hein)
 
 
 2013-07-06: 1.5.0

roundup/date.py

@@ -145,6 +145,7 @@ def get_timezone(tz):
 
 def _utc_to_local(y,m,d,H,M,S,tz):
     TZ = get_timezone(tz)
+    S = min(S, 59.999)
     frac = S - int(S)
     dt = datetime.datetime(y, m, d, H, M, int(S), tzinfo=UTC)
     y,m,d,H,M,S = dt.astimezone(TZ).timetuple()[:6]
@@ -269,6 +270,7 @@ def __init__(self, spec='.', offset=0, add_granularity=False,
             spec = spec.get_tuple()
         try:
             y,m,d,H,M,S,x,x,x = spec
+            S = min(S, 59.999)
             frac = S - int(S)
             self.year, self.month, self.day, self.hour, self.minute, \
                 self.second = _local_to_utc(y, m, d, H, M, S, offset)