summaryrefslogtreecommitdiff
path: root/kombu/compression.py
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-08-29 15:46:46 +0100
committerAsk Solem <ask@celeryproject.org>2012-08-29 15:46:46 +0100
commitf1fe4e6881916e6993d7aa548f9d8601562a225e (patch)
tree9a4bb4ef2c84bbbe916f1f60c54101ec2b6ea9da /kombu/compression.py
parentc0244d514efe1694576683b6355ab123b809f620 (diff)
parentb7c5f069a42aa400fffdf3c49f626fe7871ab8e4 (diff)
downloadkombu-asynchronous-broadcasts.tar.gz
Merge branch 'master' into asynchronous-broadcastsasynchronous-broadcasts
Diffstat (limited to 'kombu/compression.py')
-rw-r--r--kombu/compression.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kombu/compression.py b/kombu/compression.py
index 5c88fee4..c76adfc8 100644
--- a/kombu/compression.py
+++ b/kombu/compression.py
@@ -38,7 +38,7 @@ def register(encoder, decoder, content_type, aliases=[]):
def encoders():
"""Returns a list of available compression methods."""
- return _encoders.keys()
+ return list(_encoders)
def get_encoder(t):