diff --git a/python/datetime.py b/python/datetime.py index 8d8dc1de..0bbbba8a 100644 --- a/python/datetime.py +++ b/python/datetime.py @@ -1,36 +1,110 @@ -from time import localtime +from time import localtime, time -class date: +class Date: def __init__(self, year: int, month: int, day: int): - self.year = year - self.month = month - self.day = day + self.year, self.month, self.day = year, month, day - @staticmethod - def today(): + @classmethod + def today(cls): t = localtime() - return date(t.tm_year, t.tm_mon, t.tm_mday) - + return cls(t.tm_year, t.tm_mon, t.tm_mday) + def __str__(self): return f"{self.year}-{self.month:02}-{self.day:02}" - + def __repr__(self): - return f"datetime.date({self.year}, {self.month}, {self.day})" + return f"Date({self.year}, {self.month}, {self.day})" -class datetime(date): + def __eq__(self, other: 'Date') -> bool: + return (self.year, self.month, self.day) == (other.year, other.month, other.day) + + def __lt__(self, other: 'Date') -> bool: + return (self.year, self.month, self.day) < (other.year, other.month, other.day) + + def __le__(self, other: 'Date') -> bool: + return self < other or self == other + + def __gt__(self, other: 'Date') -> bool: + return not (self < other or self == other) + + def __ge__(self, other: 'Date') -> bool: + return not (self < other) + + def __add__(self, timedelta) -> 'Date': + # Implement the addition logic here + pass + + def __sub__(self, timedelta) -> 'Date': + # Implement the subtraction logic here + pass + +class DateTime(Date): def __init__(self, year: int, month: int, day: int, hour: int, minute: int, second: int): - super(datetime, self).__init__(year, month, day) - self.hour = hour - self.minute = minute - self.second = second + super().__init__(year, month, day) + self.hour, self.minute, self.second = hour, minute, second - @staticmethod - def now(): + @classmethod + def now(cls): t = localtime() - return datetime(t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec) + return cls(t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec) def __str__(self): - return f"{self.year}-{self.month:02}-{self.day:02} {self.hour:02}:{self.minute:02}:{self.second:02}" + date_str = super().__str__() + return f"{date_str} {self.hour:02}:{self.minute:02}:{self.second:02}" def __repr__(self): - return f"datetime.datetime({self.year}, {self.month}, {self.day}, {self.hour}, {self.minute}, {self.second})" \ No newline at end of file + return f"DateTime({self.year}, {self.month}, {self.day}, {self.hour}, {self.minute}, {self.second})" + + def __eq__(self, other) -> bool: + return (self.year, self.month, self.day, self.hour, self.minute, self.second) == \ + (other.year, other.month, other.day, other.hour, other.minute, other.second) + + def __lt__(self, other) -> bool: + return (self.year, self.month, self.day, self.hour, self.minute, self.second) < \ + (other.year, other.month, other.day, other.hour, other.minute, other.second) + + def __le__(self, other) -> bool: + return self < other or self == other + + def __gt__(self, other) -> bool: + return not (self < other or self == other) + + def __ge__(self, other) -> bool: + return not (self < other) + + def __add__(self, timedelta) -> 'DateTime': + # Implement the addition logic here + pass + + def __sub__(self, timedelta) -> 'DateTime': + # Implement the subtraction logic here + pass + + def timestamp(self) -> float: + return time() + +class TimeDelta: + def __init__(self, days, seconds): + self.days, self.seconds = days, seconds + + def __repr__(self) -> str: + return f"TimeDelta({self.days}, {self.seconds})" + + def __eq__(self, other: 'TimeDelta') -> bool: + return (self.days, self.seconds) == (other.days, other.seconds) + + def __lt__(self, other: 'TimeDelta') -> bool: + return (self.days, self.seconds) < (other.days, other.seconds) + + def __le__(self, other: 'TimeDelta') -> bool: + return self < other or self == other + + def __gt__(self, other: 'TimeDelta') -> bool: + return not (self < other or self == other) + + def __ge__(self, other: 'TimeDelta') -> bool: + return not (self < other) + +class TimeZone: + def __init__(self, delta: TimeDelta): + self.delta = delta