summaryrefslogtreecommitdiff
path: root/kombu/entity.py
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2015-10-23 11:32:04 -0700
committerAsk Solem <ask@celeryproject.org>2015-10-23 11:32:04 -0700
commit4bc6e3841200cee9bcbcad4f17dfaaee1e70c192 (patch)
tree5f08296c734abb20337165bfc22b6420d85c85f6 /kombu/entity.py
parent17c8398cfaa4987961dd6efd31197e5acae50a91 (diff)
parent5d6b9be0bcabb09606076193ec1c2841700485c0 (diff)
downloadkombu-4bc6e3841200cee9bcbcad4f17dfaaee1e70c192.tar.gz
Merge branch 'tumb1er/json_error'
Diffstat (limited to 'kombu/entity.py')
-rw-r--r--kombu/entity.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/kombu/entity.py b/kombu/entity.py
index a482e90a..c21c9c25 100644
--- a/kombu/entity.py
+++ b/kombu/entity.py
@@ -9,7 +9,7 @@ from __future__ import absolute_import
import numbers
-from .abstract import MaybeChannelBound
+from .abstract import MaybeChannelBound, Object
from .exceptions import ContentDisallowed
from .five import string_t
from .serialization import prepare_accept_content
@@ -307,7 +307,7 @@ class Exchange(MaybeChannelBound):
return not self.auto_delete
-class binding(object):
+class binding(Object):
"""Represents a queue or exchange binding.
:keyword exchange: Exchange to bind to.
@@ -317,6 +317,13 @@ class binding(object):
"""
+ attrs = (
+ ('exchange', None),
+ ('routing_key', None),
+ ('arguments', None),
+ ('unbind_arguments', None)
+ )
+
def __init__(self, exchange=None, routing_key='',
arguments=None, unbind_arguments=None):
self.exchange = exchange