Skip to content

Commit

Permalink
ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
brandon-doist committed Feb 27, 2025
1 parent f6cb0ec commit 57c93d0
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 13 deletions.
40 changes: 32 additions & 8 deletions bitmapist/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,9 @@ class YearEvents(GenericPeriodEvents):
"""

@classmethod
def from_date(cls, event_name, dt: Optional[date | datetime] = None, system="default"):
def from_date(
cls, event_name, dt: Optional[date | datetime] = None, system="default"
):
dt = dt or datetime.now(tz=timezone.utc)
return cls(event_name, dt.year, system=system)

Expand Down Expand Up @@ -507,7 +509,9 @@ class MonthEvents(GenericPeriodEvents):
"""

@classmethod
def from_date(cls, event_name, dt: Optional[date | datetime] = None, system="default"):
def from_date(
cls, event_name, dt: Optional[date | datetime] = None, system="default"
):
dt = dt or datetime.now(tz=timezone.utc)
return cls(event_name, dt.year, dt.month, system=system)

Expand All @@ -528,7 +532,9 @@ def period_start(self):

def period_end(self):
_, day = calendar.monthrange(self.year, self.month)
return datetime(self.year, self.month, day, 23, 59, 59, 999999, tzinfo=timezone.utc)
return datetime(
self.year, self.month, day, 23, 59, 59, 999999, tzinfo=timezone.utc
)


class WeekEvents(GenericPeriodEvents):
Expand All @@ -542,7 +548,10 @@ class WeekEvents(GenericPeriodEvents):

@classmethod
def from_date(
cls, event_name: str, dt: Optional[date | datetime] = None, system: str = "default"
cls,
event_name: str,
dt: Optional[date | datetime] = None,
system: str = "default",
):
dt = dt or datetime.now(tz=timezone.utc)
dt_year, dt_week, _ = dt.isocalendar()
Expand Down Expand Up @@ -581,7 +590,9 @@ class DayEvents(GenericPeriodEvents):
"""

@classmethod
def from_date(cls, event_name: str, dt: Optional[date | datetime] = None, system="default"):
def from_date(
cls, event_name: str, dt: Optional[date | datetime] = None, system="default"
):
dt = dt or datetime.now(tz=timezone.utc)
return cls(event_name, dt.year, dt.month, dt.day, system=system)

Expand All @@ -602,7 +613,9 @@ def period_start(self) -> datetime:
return datetime(self.year, self.month, self.day, tzinfo=timezone.utc)

def period_end(self) -> datetime:
return datetime(self.year, self.month, self.day, 23, 59, 59, 999999, tzinfo=timezone.utc)
return datetime(
self.year, self.month, self.day, 23, 59, 59, 999999, tzinfo=timezone.utc
)


class HourEvents(GenericPeriodEvents):
Expand Down Expand Up @@ -642,7 +655,9 @@ def __init__(
)

def delta(self, value):
dt = datetime(self.year, self.month, self.day, self.hour, tzinfo=timezone.utc) + timedelta(hours=value)
dt = datetime(
self.year, self.month, self.day, self.hour, tzinfo=timezone.utc
) + timedelta(hours=value)
return self.__class__(
self.event_name, dt.year, dt.month, dt.day, dt.hour, self.system
)
Expand All @@ -651,7 +666,16 @@ def period_start(self) -> datetime:
return datetime(self.year, self.month, self.day, self.hour, tzinfo=timezone.utc)

def period_end(self) -> datetime:
return datetime(self.year, self.month, self.day, self.hour, 59, 59, 999999, tzinfo=timezone.utc)
return datetime(
self.year,
self.month,
self.day,
self.hour,
59,
59,
999999,
tzinfo=timezone.utc,
)


# --- Bit operations
Expand Down
20 changes: 15 additions & 5 deletions test/test_from_date.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,40 @@


def test_from_date_year():
ev1 = bitmapist.YearEvents.from_date("foo", datetime(2014, 1, 1, tzinfo=timezone.utc))
ev1 = bitmapist.YearEvents.from_date(
"foo", datetime(2014, 1, 1, tzinfo=timezone.utc)
)
ev2 = bitmapist.YearEvents("foo", 2014)
assert ev1 == ev2


def test_from_date_month():
ev1 = bitmapist.MonthEvents.from_date("foo", datetime(2014, 1, 1, tzinfo=timezone.utc))
ev1 = bitmapist.MonthEvents.from_date(
"foo", datetime(2014, 1, 1, tzinfo=timezone.utc)
)
ev2 = bitmapist.MonthEvents("foo", 2014, 1)
assert ev1 == ev2


def test_from_date_week():
ev1 = bitmapist.MonthEvents.from_date("foo", datetime(2014, 1, 1, tzinfo=timezone.utc))
ev1 = bitmapist.MonthEvents.from_date(
"foo", datetime(2014, 1, 1, tzinfo=timezone.utc)
)
ev2 = bitmapist.MonthEvents("foo", 2014, 1)
assert ev1 == ev2


def test_from_date_day():
ev1 = bitmapist.DayEvents.from_date("foo", datetime(2014, 1, 1, tzinfo=timezone.utc))
ev1 = bitmapist.DayEvents.from_date(
"foo", datetime(2014, 1, 1, tzinfo=timezone.utc)
)
ev2 = bitmapist.DayEvents("foo", 2014, 1, 1)
assert ev1 == ev2


def test_from_date_hour():
ev1 = bitmapist.HourEvents.from_date("foo", datetime(2014, 1, 1, 1, tzinfo=timezone.utc))
ev1 = bitmapist.HourEvents.from_date(
"foo", datetime(2014, 1, 1, 1, tzinfo=timezone.utc)
)
ev2 = bitmapist.HourEvents("foo", 2014, 1, 1, 1)
assert ev1 == ev2

0 comments on commit 57c93d0

Please sign in to comment.