diff options
Diffstat (limited to 'kombu/abstract.py')
| -rw-r--r-- | kombu/abstract.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kombu/abstract.py b/kombu/abstract.py index f0968c1a..382505dd 100644 --- a/kombu/abstract.py +++ b/kombu/abstract.py @@ -4,9 +4,6 @@ kombu.compression Object utilities. -:copyright: (c) 2009 - 2012 by Ask Solem. -:license: BSD, see LICENSE for more details. - """ from __future__ import absolute_import @@ -14,7 +11,6 @@ from copy import copy from .connection import maybe_channel from .exceptions import NotBoundError -from .five import items from .utils import ChannelPromise __all__ = ['Object', 'MaybeChannelBound'] @@ -41,11 +37,6 @@ class Object(object): except AttributeError: setattr(self, name, None) - def setdefault(self, **defaults): - for key, value in items(defaults): - if getattr(self, key) is None: - setattr(self, key, value) - def as_dict(self, recurse=False): def f(obj): if recurse and isinstance(obj, Object): @@ -101,7 +92,8 @@ class MaybeChannelBound(Object): def __repr__(self, item=''): item = item or type(self).__name__ if self.is_bound: - return '<bound {0} of {1}>'.format(item, self.channel) + return '<{0} bound to chan:{1}>'.format( + item or type(self).__name__, self.channel.channel_id) return '<unbound {0}>'.format(item) @property |