Merge pull request #663 from JBKahn/patch-1

0.15.0 regression - Support negative numbers in the timestamp regular expression
arrow-py · Sep 10, 2019 · 256e53f · 256e53f
2 parents 9b05216 + 1974316
commit 256e53f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/arrow/parser.py b/arrow/parser.py
@@ -45,7 +45,7 @@ class DateTimeParser(object):
     _TZ_NAME_RE = re.compile(r"\w[\w+\-/]+")
     # NOTE: timestamps cannot be parsed from natural language strings (by removing the ^...$) because it will
     # break cases like "15 Jul 2000" and a format list (see issue #447)
-    _TIMESTAMP_RE = re.compile(r"^\d+\.?\d+$")
+    _TIMESTAMP_RE = re.compile(r"^-?\d+\.?\d+$")
     _TIME_RE = re.compile(r"^(\d{2})(?:\:?(\d{2}))?(?:\:?(\d{2}))?(?:([\.\,])(\d+))?$")
 
     _BASE_INPUT_RE_MAP = {

diff --git a/tests/parser_tests.py b/tests/parser_tests.py
@@ -224,6 +224,12 @@ def test_parse_timestamp(self):
             self.parser.parse("{:f}123456".format(float_timestamp), "X"), self.expected
         )
 
+        negative_timestamp = -1565358758
+        self.expected = datetime.fromtimestamp(negative_timestamp, tz=tz_utc)
+        self.assertEqual(
+            self.parser.parse("{:d}".format(negative_timestamp), "X"), self.expected
+        )
+
         # NOTE: timestamps cannot be parsed from natural language strings (by removing the ^...$) because it will
         # break cases like "15 Jul 2000" and a format list (see issue #447)
         with self.assertRaises(ParserError):