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.

Sign up for GitHub

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

Jump to bottom

Relaxed datetime/time parsing #539

Merged
merged 1 commit into from
Aug 26, 2023
Merged

Relaxed datetime/time parsing #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions msgspec/_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10078,11 +10078,12 @@ ms_decode_time(const char *buf, Py_ssize_t size, TypeNode *type, PathNode *path)
goto invalid;
}

/* Explicit offset requires exactly 5 bytes left */
if (buf_end - buf != 5) goto invalid;

if (buf_end - buf < 3) goto invalid;
if ((buf = ms_read_fixint(buf, 2, &offset_hour)) == NULL) goto invalid;
if (*buf++ != ':') goto invalid;
/* RFC3339 requires a ':' separator, ISO8601 doesn't. We support
* either */
if (*buf == ':') buf++;
if (buf_end - buf != 2) goto invalid;
if ((buf = ms_read_fixint(buf, 2, &offset_min)) == NULL) goto invalid;
if (offset_hour > 23 || offset_min > 59) goto invalid;
offset *= (offset_hour * 60 + offset_min);
Expand Down Expand Up @@ -10178,9 +10179,10 @@ ms_decode_datetime_from_str(
if (*buf++ != '-') goto invalid;
if ((buf = ms_read_fixint(buf, 2, &day)) == NULL) goto invalid;

/* Date/time separator can be T or t */
/* RFC3339 date/time separator can be T or t. We also support ' ', which is
* ISO8601 compatible. */
c = *buf++;
if (!(c == 'T' || c == 't')) goto invalid;
if (!(c == 'T' || c == 't' || c == ' ')) goto invalid;

/* Parse time */
if ((buf = ms_read_fixint(buf, 2, &hour)) == NULL) goto invalid;
Expand Down Expand Up @@ -10251,11 +10253,12 @@ ms_decode_datetime_from_str(
goto invalid;
}

/* Explicit offset requires exactly 5 bytes left */
if (buf_end - buf != 5) goto invalid;

if (buf_end - buf < 3) goto invalid;
if ((buf = ms_read_fixint(buf, 2, &offset_hour)) == NULL) goto invalid;
if (*buf++ != ':') goto invalid;
/* RFC3339 requires a ':' separator, ISO8601 doesn't. We support
* either */
if (*buf == ':') buf++;
if (buf_end - buf != 2) goto invalid;
if ((buf = ms_read_fixint(buf, 2, &offset_min)) == NULL) goto invalid;
if (offset_hour > 23 || offset_min > 59) goto invalid;
offset *= (offset_hour * 60 + offset_min);
Expand Down
19 changes: 19 additions & 0 deletions tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3211,6 +3211,20 @@ def test_decode_time_not_case_sensitive(self, proto, z):
res = proto.decode(proto.encode(f"04:05:06.000007{z}"), type=datetime.time)
assert res == sol

@pytest.mark.parametrize(
"lax, strict",
[
("03:04:05+0102", "03:04:05+01:02"),
("03:04:05-0102", "03:04:05-01:02"),
],
)
def test_decode_time_rfc3339_relaxed(self, lax, strict, proto):
"""msgspec supports a few relaxations of the RFC3339 format."""
sol = datetime.time.fromisoformat(strict)
msg = proto.encode(lax)
res = proto.decode(msg, type=datetime.time)
assert res == sol

@pytest.mark.parametrize(
"t, sol",
[
Expand Down Expand Up @@ -3258,13 +3272,16 @@ def test_decode_time_nanos(self, proto, t, sol):
"01:02:3.0000004Z",
"01:02:03.0000004+5:06",
"01:02:03.0000004+05:6",
"01:02:03.0000004+056",
"01:02:03.0000004+05600",
# Trailing data
"01:02:030",
"01:02:03a",
"01:02:03.a",
"01:02:03.0a",
"01:02:03.0000004a",
"01:02:03.0000004+00:000",
"01:02:03.0000004+00000",
"01:02:03.0000004Z0",
# Truncated
"01:02:3",
Expand All @@ -3280,6 +3297,8 @@ def test_decode_time_nanos(self, proto, t, sol):
"01:02:03.00a+05:06",
"01:02:03.004+0a:06",
"01:02:03.004+05:0a",
"01:02:03.004+0a06",
"01:02:03.004+050a",
# Hour out of range
"24:02:03.004",
# Minute out of range
Expand Down
19 changes: 19 additions & 0 deletions tests/test_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,21 @@ def test_decode_datetime_nanos(self, msg, sol):
res = msgspec.json.decode(msg, type=datetime.datetime)
assert res == sol

@pytest.mark.parametrize(
"lax, strict",
[
("2022-01-02T03:04:05+0102", "2022-01-02T03:04:05+01:02"),
("2022-01-02T03:04:05-0102", "2022-01-02T03:04:05-01:02"),
("2022-01-02 03:04:05", "2022-01-02T03:04:05"),
],
)
def test_decode_datetime_rfc3339_relaxed(self, lax, strict):
"""msgspec supports a few relaxations of the RFC3339 format."""
sol = datetime.datetime.fromisoformat(strict)
msg = msgspec.json.encode(lax)
res = msgspec.json.decode(msg, type=datetime.datetime)
assert res == sol

@pytest.mark.parametrize(
"s",
[
Expand All @@ -996,8 +1011,10 @@ def test_decode_datetime_nanos(self, msg, sol):
b'"0001-02-03T04:05:6.000007Z"',
b'"0001-02-03T04:05:06.000007+0:00"',
b'"0001-02-03T04:05:06.000007+00:0"',
b'"0001-02-03T04:05:06.000007+000"',
# Trailing data
b'"0001-02-03T04:05:06.000007+00:000"',
b'"0001-02-03T04:05:06.000007+00000"',
b'"0001-02-03T04:05:06.000007Z0"',
b'"0001-02-03T04:05:06a"',
b'"0001-02-03T04:05:06.000007a"',
Expand All @@ -1019,6 +1036,8 @@ def test_decode_datetime_nanos(self, msg, sol):
b'"0001-02-03T04:05:06.000007a"',
b'"0001-02-03T04:05:06.000007+0a:00"',
b'"0001-02-03T04:05:06.000007+00:0a"',
b'"0001-02-03T04:05:06.000007+0a00"',
b'"0001-02-03T04:05:06.000007+000a"',
# Year out of range
b'"0000-02-03T04:05:06.000007Z"',
# Month out of range
Expand Down
Loading