Must not use utcnow if not CELERY_ENABLE_UTC :doh: Closes #636

celery/app/base.py

@@ -352,7 +352,7 @@ class Celery(object):
         return find_deprecated_settings(c)
 
     def now(self):
-        return self.loader.now()
+        return self.loader.now(utc=self.conf.CELERY_ENABLE_UTC)
 
     def mail_admins(self, subject, body, fail_silently=False):
         """Send an email to the admins in the :setting:`ADMINS` setting."""

celery/loaders/base.py

@@ -66,8 +66,10 @@ class BaseLoader(object):
         self.app = app_or_default(app)
         self.task_modules = set()
 
-    def now(self):
-        return datetime.utcnow()
+    def now(self, utc=True):
+        if utc:
+            return datetime.utcnow()
+        return datetime.now()
 
     def on_task_init(self, task_id, task):
         """This method is called before a task is executed."""