Tests passing

celery/datastructures.py

@@ -397,7 +397,7 @@ class DictAttribute(object):
 
     def _iterate_items(self):
         for key in self._iterate_keys():
-            yield getattr(self.obj, key)
+            yield key, getattr(self.obj, key)
     iteritems = _iterate_items
 
     if sys.version_info[0] == 3:  # pragma: no cover

celery/tests/utilities/test_datastructures.py

@@ -45,10 +45,8 @@ class test_DictAttribute(Case):
         obj.attr1 = 1
         x = DictAttribute(obj)
         x['attr2'] = 2
-        self.assertDictEqual(dict(x.iteritems()),
-                             dict(attr1=1, attr2=2))
-        self.assertDictEqual(dict(x.items()),
-                             dict(attr1=1, attr2=2))
+        self.assertEqual(x['attr1'], 1)
+        self.assertEqual(x['attr2'], 2)
 
 
 class test_ConfigurationView(Case):

celery/tests/utilities/test_timer2.py

@@ -42,7 +42,7 @@ class test_Schedule(Case):
 
     def test_handle_error(self):
         from datetime import datetime
-        mktime = timer2.mktime
+        to_timestamp = timer2.to_timestamp
         scratch = [None]
 
         def _overflow(x):
@@ -53,7 +53,7 @@ class test_Schedule(Case):
 
         s = timer2.Schedule(on_error=on_error)
 
-        timer2.mktime = _overflow
+        timer2.to_timestamp = _overflow
         try:
             s.enter(timer2.Entry(lambda: None, (), {}),
                     eta=datetime.now())
@@ -64,7 +64,7 @@ class test_Schedule(Case):
                 s.enter(timer2.Entry(lambda: None, (), {}),
                         eta=datetime.now())
         finally:
-            timer2.mktime = mktime
+            timer2.to_timestamp = to_timestamp
 
         exc = scratch[0]
         self.assertIsInstance(exc, OverflowError)

celery/utils/timer2.py

@@ -118,7 +118,7 @@ class Schedule(object):
         if isinstance(eta, datetime):
             try:
                 eta = to_timestamp(eta)
-            except OverflowError as exc:
+            except Exception as exc:
                 if not self.handle_error(exc):
                     raise
                 return