diff options
| author | Ask Solem <ask@celeryproject.org> | 2013-10-01 18:40:39 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2013-10-01 18:40:39 +0100 |
| commit | 025df2235396364469edf24ab1c6d1a81d948caf (patch) | |
| tree | 2066d664007b659ec2c2e1741ff624c1a36f2490 /kombu/entity.py | |
| parent | 61c14b22f586b237a0d6bd4c6e68ef3365e2bcf1 (diff) | |
| parent | 0f384703997f9a9a080ab44b639574834ff81fd1 (diff) | |
| download | kombu-025df2235396364469edf24ab1c6d1a81d948caf.tar.gz | |
Merge branch '2.5'
Conflicts:
Changelog
kombu/common.py
Diffstat (limited to 'kombu/entity.py')
| -rw-r--r-- | kombu/entity.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kombu/entity.py b/kombu/entity.py index 942f48eb..254f2c62 100644 --- a/kombu/entity.py +++ b/kombu/entity.py @@ -288,7 +288,7 @@ class Exchange(MaybeChannelBound): @property def can_cache_declaration(self): - return self.durable + return self.durable and not self.auto_delete class binding(object): @@ -670,7 +670,7 @@ class Queue(MaybeChannelBound): @property def can_cache_declaration(self): - return self.durable + return self.durable and not self.auto_delete @classmethod def from_dict(self, queue, **options): |