Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated regular expressions, fixed a few bugs, added tests for v0.15.0 #639

Merged
merged 19 commits into from
Sep 8, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added remaining regex tests
jadchaar committed Aug 13, 2019
commit 87684c142e65db38a96c9e279ddb46a640f6a2cf
11 changes: 5 additions & 6 deletions arrow/parser.py
Original file line number Diff line number Diff line change
@@ -32,12 +32,11 @@ class DateTimeParser(object):
_TWO_DIGIT_RE = re.compile(r"\d{2}")
_THREE_DIGIT_RE = re.compile(r"\d{3}")
_FOUR_DIGIT_RE = re.compile(r"\d{4}")
# TODO: test someone passing +Z or -Z
# https://regex101.com/r/ifOZxu/4
_TZ_RE_Z = re.compile(r"([\+\-])(\d{2})(?:(\d{2}))?|Z")
_TZ_Z_RE = re.compile(r"([\+\-])(\d{2})(?:(\d{2}))?|Z")
# https://regex101.com/r/ifOZxu/5
_TZ_RE_ZZ = re.compile(r"([\+\-])(\d{2})(?:\:(\d{2}))?|Z")
# _TZ_RE_ZZ = re.compile(r"[\+\-]\d{2}:(\d{2})?|Z")
# _TZ_RE_Z = re.compile(r"[\+\-]\d{2}(\d{2})?|Z")
_TZ_ZZ_RE = re.compile(r"([\+\-])(\d{2})(?:\:(\d{2}))?|Z")
_TZ_NAME_RE = re.compile(r"\w[\w+\-/]+")
_TIMESTAMP_RE = re.compile(r"^\d+\.?\d+$")
# TODO: test timestamp thoroughly
@@ -62,8 +61,8 @@ class DateTimeParser(object):
"s": _ONE_OR_TWO_DIGIT_RE,
"X": _TIMESTAMP_RE,
"ZZZ": _TZ_NAME_RE,
"ZZ": _TZ_RE_ZZ,
"Z": _TZ_RE_Z,
"ZZ": _TZ_ZZ_RE,
"Z": _TZ_Z_RE,
"S": _ONE_OR_MORE_DIGIT_RE,
}

49 changes: 25 additions & 24 deletions tests/parser_tests.py
Original file line number Diff line number Diff line change
@@ -582,30 +582,31 @@ def test_digits(self):
parser.DateTimeParser._FOUR_DIGIT_RE.findall("1234-56"), ["1234"]
)

# def test_tz(self):
# tz_re = parser.DateTimeParser._TZ_RE
#
# self.assertEqual(
# tz_re.findall("-07:00"), ["-07", "00"]
# )
#
# self.assertEqual(
# tz_re.findall("+07:00"), ["+07:00"]
# )
#
# self.assertEqual(
# tz_re.findall("-0700"), ["-0700"]
# )
#
# self.assertEqual(
# tz_re.findall("+0700"), ["+0700"]
# )
#
# self.assertEqual(
# tz_re.findall("Z"), ["Z"]
# )

# what about +Z?
def test_tz(self):
tz_z_re = parser.DateTimeParser._TZ_Z_RE
self.assertEqual(tz_z_re.findall("-0700"), [("-", "07", "00")])
self.assertEqual(tz_z_re.findall("+07"), [("+", "07", "")])
self.assertTrue(tz_z_re.search("15/01/2019T04:05:06.789120Z") is not None)
self.assertTrue(tz_z_re.search("15/01/2019T04:05:06.789120") is None)

tz_zz_re = parser.DateTimeParser._TZ_ZZ_RE
self.assertEqual(tz_zz_re.findall("-07:00"), [("-", "07", "00")])
self.assertEqual(tz_zz_re.findall("+07"), [("+", "07", "")])
self.assertTrue(tz_zz_re.search("15/01/2019T04:05:06.789120Z") is not None)
self.assertTrue(tz_zz_re.search("15/01/2019T04:05:06.789120") is None)

tz_name_re = parser.DateTimeParser._TZ_NAME_RE
self.assertEqual(tz_name_re.findall("Europe/Warsaw"), ["Europe/Warsaw"])
self.assertEqual(tz_name_re.findall("GMT"), ["GMT"])

def test_timestamp(self):
timestamp_re = parser.DateTimeParser._TIMESTAMP_RE
self.assertEqual(
timestamp_re.findall("1565707550.452729"), ["1565707550.452729"]
)
self.assertEqual(timestamp_re.findall("1565707550"), ["1565707550"])
self.assertEqual(timestamp_re.findall("1565707550."), [])
self.assertEqual(timestamp_re.findall(".1565707550"), [])


class DateTimeParserISOTests(Chai):