Handle date with over 999999 microseconds

arrow/parser.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 import re
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from dateutil import tz
 
@@ -275,15 +275,28 @@ def _build_datetime(parts):
         elif am_pm == "am" and hour == 12:
             hour = 0
 
-        return datetime(
-            year=parts.get("year", 1),
-            month=parts.get("month", 1),
-            day=parts.get("day", 1),
-            hour=hour,
-            minute=parts.get("minute", 0),
-            second=parts.get("second", 0),
-            microsecond=parts.get("microsecond", 0),
-            tzinfo=parts.get("tzinfo"),
+        # account for rounding up to 1000000
+        microsecond = parts.get("microsecond", 0)
+        if microsecond == 1000000:
+            microsecond = 0
+            second_increment = 1
+        else:
+            second_increment = 0
+
+        increment = timedelta(seconds=second_increment)
+
+        return (
+            datetime(
+                year=parts.get("year", 1),
+                month=parts.get("month", 1),
+                day=parts.get("day", 1),
+                hour=hour,
+                minute=parts.get("minute", 0),
+                second=parts.get("second", 0),
+                microsecond=microsecond,
+                tzinfo=parts.get("tzinfo"),
+            )
+            + increment
         )
 
     def _parse_multiformat(self, string, formats):

tests/parser_tests.py

@@ -315,6 +315,29 @@ def test_parse_subsecond_rounding(self):
         self.assertEqual(self.parser.parse(string, format), self.expected)
         self.assertEqual(self.parser.parse_iso(string), self.expected)
 
+        # overflow (zero out the subseconds and increment the seconds)
+        # regression tests for issue #636
+        self.expected = datetime(2013, 1, 1, 12, 30, 46)
+        string = "2013-01-01 12:30:45.9999995"
+        self.assertEqual(self.parser.parse(string, format), self.expected)
+        self.assertEqual(self.parser.parse_iso(string), self.expected)
+
+        self.expected = datetime(2013, 1, 1, 12, 31, 0)
+        string = "2013-01-01 12:30:59.9999999"
+        self.assertEqual(self.parser.parse(string, format), self.expected)
+        self.assertEqual(self.parser.parse_iso(string), self.expected)
+
+        self.expected = datetime(2013, 1, 2, 0, 0, 0)
+        string = "2013-01-01 23:59:59.9999999"
+        self.assertEqual(self.parser.parse(string, format), self.expected)
+        self.assertEqual(self.parser.parse_iso(string), self.expected)
+
+        # 6 digits should remain unrounded
+        self.expected = datetime(2013, 1, 1, 12, 30, 45, 999999)
+        string = "2013-01-01 12:30:45.999999"
+        self.assertEqual(self.parser.parse(string, format), self.expected)
+        self.assertEqual(self.parser.parse_iso(string), self.expected)
+
     def test_map_lookup_keyerror(self):
 
         with self.assertRaises(parser.ParserError):