Skip to content

Commit fda81cc

Browse files
NekoFanaticNekoFanatic
authored andcommitted
added missing evaluator grammar
1 parent 1672c75 commit fda81cc

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

datetimeparser/evaluatormethods.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ def evaluate_constant_relatives(current_time: datetime, parsed: list) -> datetim
9292
hour, minute, sec = sanitized[-1].hours, sanitized[-1].minutes, sanitized[-1].seconds
9393
ev_out = datetime(base.year, base.month, base.day, hour, minute, sec)
9494

95+
elif sanitized[-2] in DatetimeDeltaConstants.ALL:
96+
ev_out = datetime(
97+
year=base.year,
98+
month=base.month,
99+
day=base.day,
100+
hour=sanitized[-2].time_value(None)[0],
101+
minute=sanitized[-2].time_value(None)[1],
102+
second=sanitized[-2].time_value(None)[2]
103+
)
104+
95105
elif isinstance(sanitized[-1], AbsoluteDateTime):
96106
base = datetime(
97107
year=current_time.year if sanitized[-1].year == 0 else sanitized[-1].year,
@@ -152,6 +162,16 @@ def evaluate_constants(current_time: datetime, parsed_object) -> Union[AbsoluteD
152162
else:
153163
dt = object_type.time_value(current_time.year)
154164

165+
if isinstance(dt, tuple):
166+
dt = datetime(
167+
year=current_time.year,
168+
month=current_time.month,
169+
day=current_time.day,
170+
hour=dt[0],
171+
minute=dt[1],
172+
second=dt[2]
173+
)
174+
155175
if current_time > dt and parsed_object[0] not in Constants.ALL_RELATIVE_CONSTANTS:
156176
dt += relativedelta(years=1)
157177

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
long_description_content_type="text/markdown",
1111
long_description=long_description,
1212
packages=['datetimeparser'],
13-
version='0.3a', # version number: https://peps.python.org/pep-0440/
13+
version='0.4a', # version number: https://peps.python.org/pep-0440/
1414
license='MIT',
1515
description='A parser library built for parsing the english language into datetime objects.',
1616
author='Ari24',

0 commit comments

Comments
 (0)