Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #403 #1002

Merged
merged 3 commits into from Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dateparser/date_parser.py
Expand Up @@ -17,7 +17,7 @@ def parse(self, date_string, parse_method, settings=None):
date_string = strip_braces(date_string)
date_string, ptz = pop_tz_offset_from_string(date_string)
Baviaan marked this conversation as resolved.
Show resolved Hide resolved

date_obj, period = parse_method(date_string, settings=settings)
date_obj, period = parse_method(date_string, settings=settings, ptz=ptz)

_settings_tz = settings.TIMEZONE.lower()

Expand Down
12 changes: 8 additions & 4 deletions dateparser/parser.py
Expand Up @@ -63,11 +63,11 @@ def resolve_date_order(order, lst=None):
return chart_list[order] if lst else date_order_chart[order]


def _parse_absolute(datestring, settings):
return _parser.parse(datestring, settings)
def _parse_absolute(datestring, settings, ptz=None):
return _parser.parse(datestring, settings, ptz)


def _parse_nospaces(datestring, settings):
def _parse_nospaces(datestring, settings, ptz=None):
return _no_spaces_parser.parse(datestring, settings)


Expand Down Expand Up @@ -517,13 +517,17 @@ def _correct_for_day(self, dateobj):
return dateobj

@classmethod
def parse(cls, datestring, settings):
def parse(cls, datestring, settings, ptz=None):
tokens = tokenizer(datestring)
po = cls(tokens.tokenize(), settings)
dateobj = po._results()

if ptz: # Shift naive time by utc offset before comparing to utc during corrections
dateobj = dateobj - ptz.utcoffset(None) # This argument does nothing?
# correction for past, future if applicable
dateobj = po._correct_for_time_frame(dateobj)
if ptz: # Shift time back by utc offset
dateobj = dateobj + ptz.utcoffset(None) # This argument does nothing?
Baviaan marked this conversation as resolved.
Show resolved Hide resolved

# correction for preference of day: beginning, current, end
dateobj = po._correct_for_day(dateobj)
Expand Down