Merge pull request #11 from milind-shakya-sp/debug_restart_issue

Introduce maybe_make_naive

Author: Johnny Liu

django_celery_beat/__init__.py

@@ -10,7 +10,7 @@
 
 from collections import namedtuple
 
-__version__ = '1.4.0+singleplatform.2'
+__version__ = '1.4.0+singleplatform.3'
 __author__ = 'Ask Solem'
 __contact__ = '[email protected]'
 __homepage__ = 'https://github.com/celery/django-celery-beat'

django_celery_beat/models.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from datetime import timedelta
+import dateutil
 
 import timezone_field
 from celery import schedules
@@ -117,13 +118,19 @@ def maybe_make_aware(self, dt):
         return dt
 
 
+def maybe_make_naive(dt):
+    if dt and dt.tzinfo:
+        dt = dt.replace(tzinfo=None)
+    return dt
+
+
 class TZNaiveCronSchedule(schedules.crontab):
 
     def maybe_make_aware(self, dt):
         """
         Overriding the base method, to be a no-op and returning the dt as is.
         """
-        return dt
+        return maybe_make_naive(dt)
 
 
 @python_2_unicode_compatible