Merge branch 'master' of github.com:celery/django-celery-beat

Author: milind-shakya-sp

django_celery_beat/models.py

@@ -218,7 +218,7 @@ def schedule(self):
             day_of_month=self.day_of_month,
             month_of_year=self.month_of_year,
         )
-        if settings.DJANGO_CELERY_BEAT_TZ_AWARE:
+        if getattr(settings, 'DJANGO_CELERY_BEAT_TZ_AWARE', True):
             crontab = TzAwareCrontab(
                 minute=self.minute,
                 hour=self.hour,

django_celery_beat/schedulers.py

@@ -94,7 +94,7 @@ def __init__(self, model, app=None):
 
         last_run_at = model.last_run_at
 
-        if settings.DJANGO_CELERY_BEAT_TZ_AWARE:
+        if getattr(settings, 'DJANGO_CELERY_BEAT_TZ_AWARE', True):
             last_run_at = make_aware(last_run_at)
 
         self.last_run_at = last_run_at
@@ -133,7 +133,7 @@ def _default_now(self):
         # The PyTZ datetime must be localised for the Django-Celery-Beat
         # scheduler to work. Keep in mind that timezone arithmatic
         # with a localized timezone may be inaccurate.
-        if settings.DJANGO_CELERY_BEAT_TZ_AWARE:
+        if getattr(settings, 'DJANGO_CELERY_BEAT_TZ_AWARE', True):
             now = now.tzinfo.localize(now.replace(tzinfo=None))
         return now
 
@@ -151,7 +151,7 @@ def save(self):
         for field in self.save_fields:
             setattr(obj, field, getattr(self.model, field))
 
-        if not settings.DJANGO_CELERY_BEAT_TZ_AWARE:
+        if not getattr(settings, 'DJANGO_CELERY_BEAT_TZ_AWARE', True):
             obj.last_run_at = datetime.datetime.now()
 
         obj.save()