Merge branch 'master' of github.com:celery/celery

celery/exceptions.py

@@ -21,12 +21,12 @@ __all__ = [
     'SecurityError', 'Ignore', 'QueueNotFound',
     'WorkerShutdown', 'WorkerTerminate',
     'ImproperlyConfigured', 'NotRegistered', 'AlreadyRegistered',
-    'TimeoutError', 'MaxRetriesExceededError', 'Retry',
+    'TimeoutError', 'MaxRetriesExceededError', 'Retry', 'Reject',
     'TaskRevokedError', 'NotConfigured', 'AlwaysEagerIgnored',
     'InvalidTaskError', 'ChordError', 'CPendingDeprecationWarning',
     'CDeprecationWarning', 'FixupWarning', 'DuplicateNodenameWarning',
     'SoftTimeLimitExceeded', 'TimeLimitExceeded', 'WorkerLostError',
-    'Terminated',
+    'Terminated', 'IncompleteStream'
 ]
 
 UNREGISTERED_FMT = """\

celery/schedules.py

@@ -134,9 +134,7 @@ class schedule(object):
         return schedstate(is_due=False, next=remaining_s)
 
     def maybe_make_aware(self, dt):
-        if self.utc_enabled:
-            return maybe_make_aware(dt, self.tz)
-        return dt
+        return maybe_make_aware(dt, self.tz)
 
     def __repr__(self):
         return '<freq: {0.human_seconds}>'.format(self)

celery/tests/app/test_beat.py

@@ -521,7 +521,7 @@ class test_schedule(AppCase):
         self.assertTrue(d.tzinfo)
         x.utc_enabled = False
         d2 = x.maybe_make_aware(datetime.utcnow())
-        self.assertIsNone(d2.tzinfo)
+        self.assertTrue(d2.tzinfo)
 
     def test_to_local(self):
         x = schedule(10, app=self.app)