Skip to content

Fix caching of default datetime argument #31

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

Open
SijmenHuizenga wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix caching of default datetime argument #31

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
13 changes: 9 additions & 4 deletions suntime/suntime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,46 @@ def __init__(self, lat, lon):

self.lngHour = self._lon / 15

def get_sunrise_time(self, at_date=datetime.now(), time_zone=timezone.utc):
def get_sunrise_time(self, at_date=None, time_zone=timezone.utc):
"""
:param at_date: Reference date. datetime.now() if not provided.
:param time_zone: pytz object with .tzinfo() or None
:return: sunrise datetime.
:raises: SunTimeException when there is no sunrise and sunset on given location and date.
"""
if at_date is None:
at_date = datetime.now()

time_delta = self.get_sun_timedelta(at_date, time_zone=time_zone, is_rise_time=True)
if time_delta is None:
raise SunTimeException('The sun never rises on this location (on the specified date)')
else:
return datetime.combine(at_date, time(tzinfo=time_zone)) + time_delta

def get_sunset_time(self, at_date=datetime.now(), time_zone=timezone.utc):
def get_sunset_time(self, at_date=None, time_zone=timezone.utc):
"""
Calculate the sunset time for given date.
:param at_date: Reference date. datetime.now() if not provided.
:param time_zone: pytz object with .tzinfo() or None
:return: sunset datetime.
:raises: SunTimeException when there is no sunrise and sunset on given location and date.
"""
if at_date is None:
at_date = datetime.now()
time_delta = self.get_sun_timedelta(at_date, time_zone=time_zone, is_rise_time=False)
if time_delta is None:
raise SunTimeException('The sun never rises on this location (on the specified date)')
else:
return datetime.combine(at_date, time(tzinfo=time_zone)) + time_delta

def get_local_sunrise_time(self, at_date=datetime.now(), time_zone=None):
def get_local_sunrise_time(self, at_date=None, time_zone=None):
""" DEPRECATED: Use get_sunrise_time() instead. """
warnings.warn("get_local_sunrise_time is deprecated and will be removed in future versions."
"Use get_sunrise_time with proper time zone", DeprecationWarning)

return self.get_sunrise_time(at_date, time_zone)

def get_local_sunset_time(self, at_date=datetime.now(), time_zone=None):
def get_local_sunset_time(self, at_date=None, time_zone=None):
""" DEPRECATED: Use get_sunset_time() instead. """
warnings.warn("get_local_sunset_time is deprecated and will be removed in future versions."
"Use get_sunset_time with proper time zone.", DeprecationWarning)
Expand Down