FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Scale ISO 8601 duration fractions by their digit count by ckarnell · Pull Request #993 · python-pendulum/pendulum · GitHub

/ pendulum Public

Scale ISO 8601 duration fractions by their digit count #993

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
ckarnell wants to merge 1 commit into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 0 Commits 1 Checks 0 Files changed
Open

Scale ISO 8601 duration fractions by their digit count #993

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 .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 4 additions & 4 deletions src/pendulum/parsing/iso8601.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def _parse_iso8601_duration(text: str, **options: str) -> Duration | None:
if "." in _weeks:
_weeks, portion = _weeks.split(".")
weeks = int(_weeks)
_days = int(portion) / 10 * 7
_days = int(portion) / 10 ** len(portion) * 7
days, hours = int(_days // 1), int(_days % 1 * HOURS_PER_DAY)
else:
weeks = int(_weeks)
Expand Down Expand Up @@ -344,7 +344,7 @@ def _parse_iso8601_duration(text: str, **options: str) -> Duration | None:

_days, _hours = _days.split(".")
days = int(_days)
hours = int(_hours) / 10 * HOURS_PER_DAY
hours = int(_hours) / 10 ** len(_hours) * HOURS_PER_DAY
else:
days = int(_days)

Expand Down Expand Up @@ -374,7 +374,7 @@ def _parse_iso8601_duration(text: str, **options: str) -> Duration | None:

_hours, _mins = _hours.split(".")
hours += int(_hours)
minutes += int(_mins) / 10 * MINUTES_PER_HOUR
minutes += int(_mins) / 10 ** len(_mins) * MINUTES_PER_HOUR
else:
hours += int(_hours)

Expand All @@ -389,7 +389,7 @@ def _parse_iso8601_duration(text: str, **options: str) -> Duration | None:

_minutes, _secs = _minutes.split(".")
minutes += int(_minutes)
seconds += int(_secs) / 10 * SECONDS_PER_MINUTE
seconds += int(_secs) / 10 ** len(_secs) * SECONDS_PER_MINUTE
else:
minutes += int(_minutes)

Expand Down
18 changes: 18 additions & 0 deletions tests/parsing/test_parsing_duration.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,21 @@ def test_parse_interval_invalid():
def test_parse_duration_fraction_only_allowed_on_last_component():
with pytest.raises(ParserError):
parse("P2Y3M4DT5.5H6M7S")


@pytest.mark.parametrize(
"text, seconds",
[
("P1.5D", 129600), # one fractional digit, already correct
("P1.25D", 108000),
("PT1.25H", 4500),
("PT1.05M", 63),
("P1.25W", 756000),
],
)
def test_parse_duration_multi_digit_fraction(text, seconds):
# Imports the pure-Python parser directly: `parse` uses the Rust extension
# unless PENDULUM_EXTENSIONS=0, so going through it would not exercise this.
from pendulum.parsing.iso8601 import parse_iso8601

assert parse_iso8601(text).total_seconds() == seconds
Back | FazBrowse Home | New Git URL