From af551f21b0d91543d0b46413233ddb04017cc3be Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Tue, 10 Sep 2013 15:02:15 +0100 Subject: [PATCH 1/2] [py25] Cannot use next() --- kombu/tests/transport/test_pyamqp.py | 2 +- kombu/utils/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kombu/tests/transport/test_pyamqp.py b/kombu/tests/transport/test_pyamqp.py index 6840e407..1a25f836 100644 --- a/kombu/tests/transport/test_pyamqp.py +++ b/kombu/tests/transport/test_pyamqp.py @@ -45,7 +45,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) diff --git a/kombu/utils/__init__.py b/kombu/utils/__init__.py index c5238264..7cac90bb 100644 --- a/kombu/utils/__init__.py +++ b/kombu/utils/__init__.py @@ -221,7 +221,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: From 2d056fe1d9def69cd553c5fd485714325867b0dc Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Tue, 10 Sep 2013 15:27:12 +0100 Subject: [PATCH 2/2] Adds Py3.2 + Py3.3 to Travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f0f6716b..087eb1be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,7 @@ python: - 2.5 - 2.6 - 2.7 + - 3.2 + - 3.3 install: pip install --use-mirrors tox script: TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | tr -d .) tox