update tz and get default tz

This commit is contained in:
bkfox 2017-08-23 17:01:25 +02:00
parent ddb7738a9e
commit 9f5bdce840

View File

@ -520,6 +520,21 @@ class Schedule(models.Model):
help_text = 'this schedule is a rerun of this one',
)
@property
def tz(self):
"""
Pytz timezone of the schedule.
"""
if not hasattr(self, '_tz') or self._tz.zone != self.timezone:
import pytz
if not self.timezone:
self.timezone = \
self.date.tzinfo.zone \
if self.date and hasattr(self.date, 'tzinfo') else \
tz.get_current_timezone_name()
self._tz = pytz.timezone(self.timezone or self.date.tzinfo.zone)
return self._tz
# initial cached data
__initial = None
@ -578,16 +593,6 @@ class Schedule(models.Model):
return self.frequency == 0b1111
return (self.frequency & (0b0001 << week) > 0)
@property
def tz(self):
"""
Return pytz timezone for this schedule.
"""
if not hasattr(self, '_tz') or self._tz.zone != self.timezone:
import pytz
self._tz = pytz.timezone('Europe/Brussels')
return self._tz
def normalize(self, date):
"""
Set the time of a datetime to the schedule's one