Skip to content

Reject ISO 8601 durations with missing components #494

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

Reject ISO 8601 durations with missing components #494

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
4 changes: 2 additions & 2 deletions src/environs/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ class TimeDelta(fields.TimeDelta):
_ISO_8601_REGEX = re.compile(
r"^(?:\s*)" # optional leading whitespace
r"(?P<sign>[+-]?)" # optional sign
r"P" # designator
r"P(?=\d|T\d)" # designator followed by at least one component
r"(?:(?P<weeks>\d+(?:\.\d+)?)W|" # weeks variant
r"(?:(?P<days>\d+(?:\.\d+)?)D)?" # days
r"(?:T" # time designator
r"(?:T(?=\d)" # time designator must be followed by a component
r"(?:(?P<hours>\d+(?:\.\d+)?)H)?" # hours
r"(?:(?P<minutes>\d+(?:\.\d+)?)M)?" # minutes
r"(?:(?P<seconds>\d+(?:\.\d+)?)S)?" # seconds (can be fractional)
Expand Down
17 changes: 17 additions & 0 deletions tests/test_environs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,23 @@ def test_timedelta_cast(self, set_env, env: environs.Env):
set_env({"TIMEDELTA": "PT0S"})
assert env.timedelta("TIMEDELTA", format="iso8601") == dt.timedelta()

@pytest.mark.parametrize(
"value", ["P", "PT", "+P", "-PT", " P ", " PT ", "P1DT", "P0DT", "-P1DT"]
)
def test_timedelta_iso8601_requires_components(
self, value, set_env, env: environs.Env
):
set_env({"TIMEDELTA": value})
with pytest.raises(
environs.EnvValidationError, match="Not a valid period of time"
):
env.timedelta("TIMEDELTA", format="iso8601")

@pytest.mark.parametrize("value", ["P0W", "P0D", "PT0H", "PT0M", "PT0S", "P0DT0S"])
def test_timedelta_iso8601_zero_components(self, value, set_env, env: environs.Env):
set_env({"TIMEDELTA": value})
assert env.timedelta("TIMEDELTA", format="iso8601") == dt.timedelta()

def test_time_cast(self, set_env, env: environs.Env):
set_env({"TIME": "10:30"})
assert env.time("TIME") == dt.time(hour=10, minute=30, second=0)
Expand Down