Skip to content

Parse UTC designators in from_format offset tokens #1084

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

Open
Sskift wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse UTC designators in from_format offset tokens #1084

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
3 changes: 3 additions & 0 deletions src/pendulum/formatting/formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,9 @@ def _get_parsed_value(
elif token in ["X", "x"]:
parsed["timestamp"] = parsed_token
elif token in ["ZZ", "Z"]:
if value in ["Z", "z"]:
value = "+00:00"

negative = bool(value.startswith("-"))
tz = value[1:]
if ":" not in tz:
Expand Down
14 changes: 14 additions & 0 deletions tests/datetime/test_from_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,20 @@ def test_from_format_with_timezone():
assert d.timezone_name == "Europe/London"


@pytest.mark.parametrize("token", ["Z", "ZZ"])
@pytest.mark.parametrize("offset", ["Z", "z", "+00:00", "+0000"])
@pytest.mark.parametrize("default_tz", ["UTC", "Europe/Paris"])
def test_from_format_with_utc_designator(token, offset, default_tz):
d = pendulum.from_format(
f"1975-05-21T22:32:11{offset}",
f"YYYY-MM-DD[T]HH:mm:ss{token}",
tz=default_tz,
)

assert_datetime(d, 1975, 5, 21, 22, 32, 11)
assert d.offset == 0


def test_from_format_with_square_bracket_in_timezone():
with pytest.raises(ValueError, match=r"^String does not match format"):
pendulum.from_format(
Expand Down