kenkeiras/org-rw
1
0
Fork 1
Code Issues 3 Pull Requests 1 Actions Releases Wiki Activity

Use Optional for types that might be None.

Browse Source
This commit is contained in:
Sergio Martínez Portela 2022-06-05 23:32:32 +02:00
parent a67bde58d0
commit 6b8b4de21e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org_rw/org_rw.py
View File

@ -8,7 +8,7 @@ import re
import sys import sys
from datetime import date, datetime, timedelta from datetime import date, datetime, timedelta
from enum import Enum from enum import Enum
from typing import Generator, List, Tuple, Union from typing import Generator, List, Optional, Tuple, Union
from . import dom from . import dom
@ -779,7 +779,7 @@ class Timestamp:
self.minute = minute self.minute = minute
self.repetition = repetition self.repetition = repetition
def to_datetime(self) -> Union[datetime, date]: def to_datetime(self) -> datetime:
if self.hour is not None: if self.hour is not None:
return datetime(self.year, self.month, self.day, self.hour, self.minute) return datetime(self.year, self.month, self.day, self.hour, self.minute)
else: else:
@ -955,7 +955,7 @@ def parse_org_time_range(start, end) -> TimeRange:
class OrgTime: class OrgTime:
def __init__(self, ts: Timestamp, end_time: Union[Timestamp, None] = None): def __init__(self, ts: Timestamp, end_time: Optional[Timestamp] = None):
assert ts is not None assert ts is not None
self.time = ts self.time = ts
self.end_time = end_time self.end_time = end_time
@ -1035,7 +1035,7 @@ def timerange_to_string(tr: TimeRange):
return tr.start_time.to_raw() + "--" + tr.end_time.to_raw() return tr.start_time.to_raw() + "--" + tr.end_time.to_raw()
def timestamp_to_string(ts: Timestamp, end_time: Union[Timestamp, None] = None) -> str: def timestamp_to_string(ts: Timestamp, end_time: Optional[Timestamp] = None) -> str:
date = "{year}-{month:02d}-{day:02d}".format( date = "{year}-{month:02d}-{day:02d}".format(
year=ts.year, month=ts.month, day=ts.day year=ts.year, month=ts.month, day=ts.day
) )