summaryrefslogtreecommitdiff
path: root/kombu/utils/debug.py
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-01-17 12:11:21 +0000
committerAsk Solem <ask@celeryproject.org>2013-01-17 12:11:21 +0000
commit8e9e17fc68ece79d60461a4bfc6a5179c2063227 (patch)
tree36abb79cb4db34030d874cc2a8c95a47ed565c0c /kombu/utils/debug.py
parent2b835ab415b126664ff6741a72f70afee538df73 (diff)
parent6b25c9f050cfbc2720cd550b0c52d8e00518877a (diff)
downloadkombu-8e9e17fc68ece79d60461a4bfc6a5179c2063227.tar.gz
Merge branch '2.5'
Conflicts: kombu/connection.py kombu/pidbox.py kombu/serialization.py kombu/tests/compat.py kombu/tests/mocks.py kombu/tests/test_compat.py kombu/tests/test_serialization.py kombu/tests/test_utils.py kombu/tests/transport/virtual/test_base.py kombu/transport/django/management/commands/clean_kombu_messages.py kombu/transport/django/migrations/0001_initial.py kombu/transport/mongodb.py kombu/transport/redis.py kombu/transport/virtual/__init__.py kombu/utils/__init__.py kombu/utils/debug.py kombu/utils/encoding.py kombu/utils/finalize.py
Diffstat (limited to 'kombu/utils/debug.py')
-rw-r--r--kombu/utils/debug.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kombu/utils/debug.py b/kombu/utils/debug.py
index aeea4e4f..553eee06 100644
--- a/kombu/utils/debug.py
+++ b/kombu/utils/debug.py
@@ -52,7 +52,7 @@ class Logwrapped(object):
if args:
info += ', '
info += ', '.join('{k}={v!r}'.format(k=key, v=value)
- for key, value in items(kwargs))
+ for key, value in items(kwargs))
info += ')'
self.logger.debug(info)
return meth(*args, **kwargs)