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/mongodb.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/mongodb.py')
| -rw-r--r-- | kombu/transport/mongodb.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kombu/transport/mongodb.py b/kombu/transport/mongodb.py index 18c49971..91603688 100644 --- a/kombu/transport/mongodb.py +++ b/kombu/transport/mongodb.py @@ -55,7 +55,7 @@ class Channel(virtual.Channel): msg = self.client.command('findandmodify', 'messages', query={'queue': queue}, sort={'_id': pymongo.ASCENDING}, remove=True) - except errors.OperationFailure as exc: + except errors.OperationFailure, exc: if 'No matching object found' in exc.args[0]: raise Empty() raise |