Skip to content

fix: pendulum.parse('2007-12-13/14:30') raised TypeError instead of uniform ValueError #954

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
alexanderlukanin13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: pendulum.parse('2007-12-13/14:30') raised TypeError instead of uniform ValueError #954

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
5 changes: 3 additions & 2 deletions src/pendulum/interval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ class Interval(Duration, Generic[_T]):
"""

def __new__(cls, start: _T, end: _T, absolute: bool = False) -> Self:
if (isinstance(start, datetime) and not isinstance(end, datetime)) or (
not isinstance(start, datetime) and isinstance(end, datetime)
if (isinstance(start, datetime) and not isinstance(end, datetime) or
not isinstance(start, datetime) and isinstance(end, datetime) or
not (isinstance(start, date) and isinstance(end, date)) # Time not allowed
):
raise ValueError(
"Both start and end of an Interval must have the same type"
Expand Down
15 changes: 15 additions & 0 deletions tests/test_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from __future__ import annotations

import pytest

import pendulum

from tests.conftest import assert_date
Expand Down Expand Up @@ -127,6 +129,19 @@ def test_parse_interval() -> None:
assert interval.end.offset == 0


def test_parse_interval_mixed_types():
error = 'Both start and end of an Interval must have the same type'

# date / time is not allowed in ISO 8601
with pytest.raises(ValueError, match=error):
pendulum.parse('2007-12-13/14:30')

# datetime / time is allowed in some lenient ISO 8601 implementations (e.g. aniso8601 package).
# Not allowed in pendulum for strictness and consistency.
with pytest.raises(ValueError, match=error):
pendulum.parse('2007-12-13T14:30/15:45')


def test_parse_now() -> None:
assert pendulum.parse("now").timezone_name == "UTC"
assert (
Expand Down