Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions utt/components/report_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from enum import Enum, auto
from typing import NamedTuple, Optional

from ..fromisocalendar import date_fromisocalendar
from .now import Now


Expand Down Expand Up @@ -195,7 +194,7 @@ def parse_relative_week(today, weekstring):
(year, week, _d) = (today - datetime.timedelta(days=7)).isocalendar()
else:
return None
return date_fromisocalendar(year, week, 1)
return datetime.date.fromisocalendar(year, week, 1)


def parse_week_number(today, weekstring):
Expand All @@ -210,12 +209,12 @@ def parse_week_number(today, weekstring):
one_week = datetime.timedelta(days=7)
# Note: weeknum is negative so this effectively subtracts
(year, week, _d) = (today + weeknum * one_week).isocalendar()
return date_fromisocalendar(year, week, 1)
return datetime.date.fromisocalendar(year, week, 1)
else:
(year, week, _d) = today.isocalendar()
if weeknum > week:
year -= 1
return date_fromisocalendar(year, weeknum, 1)
return datetime.date.fromisocalendar(year, weeknum, 1)


def parse_week(today, weekstring):
Expand Down
176 changes: 0 additions & 176 deletions utt/fromisocalendar.py

This file was deleted.