Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5'

This commit is contained in:
Ask Solem 2013-09-10 15:27:24 +01:00
parent ef40626818 2d056fe1d9
commit 53d1f06a5c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kombu/tests/transport/test_pyamqp.py
View File

@ -44,7 +44,7 @@ class test_Channel(TestCase):
pass
self.conn = Mock()
self.conn._get_free_channel_id.side_effect = partial(next, count(0))
self.conn._get_free_channel_id.side_effect = count(0).next
self.conn.channels = {}
self.channel = Channel(self.conn, 0)

2
kombu/utils/__init__.py
View File

@ -224,7 +224,7 @@ def retry_over_time(fun, catch, args=[], kwargs={}, errback=None,
if callback:
callback()
tts = (errback(exc, interval_range, retries) if errback
else next(interval_range))
else interval_range.next())
if tts:
for i in range(int(tts / interval_step)):
if callback: