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.

Sign up for GitHub

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

Jump to bottom

remove self.now from freshness_date_parser #885

Merged
merged 1 commit into from
Feb 18, 2021
Merged

remove self.now from freshness_date_parser #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions dateparser/freshness_date_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

class FreshnessDateDataParser:
""" Parses date string like "1 year, 2 months ago" and "3 hours, 50 minutes ago" """
def __init__(self):
self.now = None

def _are_all_words_units(self, date_string):
skip = [_UNITS,
Expand Down Expand Up @@ -59,42 +57,42 @@ def apply_time(dateobj, timeobj):
)

if settings.RELATIVE_BASE:
self.now = settings.RELATIVE_BASE
now = settings.RELATIVE_BASE

if 'local' not in _settings_tz:
self.now = localize_timezone(self.now, settings.TIMEZONE)
now = localize_timezone(now, settings.TIMEZONE)

if ptz:
if self.now.tzinfo:
self.now = self.now.astimezone(ptz)
if now.tzinfo:
now = now.astimezone(ptz)
else:
if hasattr(ptz, 'localize'):
self.now = ptz.localize(self.now)
now = ptz.localize(now)
else:
self.now = self.now.replace(tzinfo=ptz)
now = now.replace(tzinfo=ptz)

if not self.now.tzinfo:
if not now.tzinfo:
if hasattr(self.get_local_tz(), 'localize'):
self.now = self.get_local_tz().localize(self.now)
now = self.get_local_tz().localize(now)
else:
self.now = self.now.replace(tzinfo=self.get_local_tz())
now = now.replace(tzinfo=self.get_local_tz())

elif ptz:
_now = datetime.now(ptz)
localized_now = datetime.now(ptz)

if 'local' in _settings_tz:
self.now = _now
now = localized_now
else:
self.now = apply_timezone(_now, settings.TIMEZONE)
now = apply_timezone(localized_now, settings.TIMEZONE)

else:
if 'local' not in _settings_tz:
utc_dt = datetime.utcnow()
self.now = apply_timezone(utc_dt, settings.TIMEZONE)
now = apply_timezone(utc_dt, settings.TIMEZONE)
else:
self.now = datetime.now(self.get_local_tz())
now = datetime.now(self.get_local_tz())

date, period = self._parse_date(date_string, settings.PREFER_DATES_FROM)
date, period = self._parse_date(date_string, now, settings.PREFER_DATES_FROM)

if date:
old_date = date
Expand All @@ -112,10 +110,9 @@ def apply_time(dateobj, timeobj):
):
date = date.replace(tzinfo=None)

self.now = None
return date, period

def _parse_date(self, date_string, prefer_dates_from):
def _parse_date(self, date_string, now, prefer_dates_from):
if not self._are_all_words_units(date_string):
return None, None

Expand All @@ -135,9 +132,9 @@ def _parse_date(self, date_string, prefer_dates_from):
or re.search(r'\bfuture\b', prefer_dates_from)
and not re.search(r'\bago\b', date_string)
):
date = self.now + td
date = now + td
else:
date = self.now - td
date = now - td
return date, period

def get_kwargs(self, date_string):
Expand Down
1 change: 0 additions & 1 deletion tests/test_freshness_date_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,6 @@ def wrapped(*args, **kwargs):
collecting_get_date_data(freshness_date_parser.get_date_data)))

self.freshness_parser = Mock(wraps=freshness_date_parser)
self.add_patch(patch.object(self.freshness_parser, 'now', self.now))

dt_mock = Mock(wraps=dateparser.freshness_date_parser.datetime)
dt_mock.utcnow = Mock(return_value=self.now)
Expand Down