diff options
| author | Ask Solem <ask@celeryproject.org> | 2012-11-27 15:48:42 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2012-11-27 15:48:42 +0000 |
| commit | f68f8ac8c0808c6c33f3c4cbab7c7932e1ccd48d (patch) | |
| tree | a4ec01bc6f13bb11ece248c5384103c76f3bc22b /kombu/transport/pyamqp.py | |
| parent | 325fcc0522571096b424080c232f0d87a1e5865e (diff) | |
| parent | 6b77885cf0e26b0f08a38db08835e8e43cd3ae91 (diff) | |
| download | kombu-f68f8ac8c0808c6c33f3c4cbab7c7932e1ccd48d.tar.gz | |
Merge branch 'master' into 3.0
Conflicts:
kombu/abstract.py
kombu/clocks.py
kombu/messaging.py
kombu/pidbox.py
kombu/pools.py
kombu/tests/mocks.py
kombu/tests/test_common.py
kombu/tests/test_messaging.py
kombu/tests/test_serialization.py
kombu/tests/test_utils.py
kombu/tests/transport/test_redis.py
kombu/tests/utilities/test_encoding.py
kombu/transport/pika.py
kombu/transport/zmq.py
kombu/transport/zookeeper.py
kombu/utils/__init__.py
kombu/utils/encoding.py
kombu/utils/finalize.py
pavement.py
requirements/default.txt
Diffstat (limited to 'kombu/transport/pyamqp.py')
| -rw-r--r-- | kombu/transport/pyamqp.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kombu/transport/pyamqp.py b/kombu/transport/pyamqp.py index d03178e0..eec7d744 100644 --- a/kombu/transport/pyamqp.py +++ b/kombu/transport/pyamqp.py @@ -4,9 +4,6 @@ kombu.transport.pyamqp pure python amqp transport. -:copyright: (c) 2009 - 2012 by Ask Solem. -:license: BSD, see LICENSE for more details. - """ from __future__ import absolute_import @@ -23,7 +20,7 @@ from . import base DEFAULT_PORT = 5672 -if amqp.VERSION < (0, 9, 3): +if amqp.VERSION < (0, 9, 3): # pragma: no cover raise VersionMismatch('Please install amqp version 0.9.3 or higher.') |