diff --git a/LICENSE b/LICENSE index 3234c403..a8e9a51f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012 VMware, Inc. All rights reserved. +Copyright (c) 2012-2013 GoPivotal, Inc. All rights reserved. Copyright (c) 2009-2012, Ask Solem & contributors. All rights reserved. diff --git a/kombu/serialization.py b/kombu/serialization.py index 0107ac6d..72425ded 100644 --- a/kombu/serialization.py +++ b/kombu/serialization.py @@ -183,8 +183,9 @@ class SerializerRegistry(object): def _for_untrusted_content(self, ctype, why): return ContentDisallowed( 'Refusing to decode {0} content of type {1}'.format( - why, parenthesize_alias(self.type_to_name[ctype], ctype)), - ) + why, + parenthesize_alias(self.type_to_name.get(ctype, ctype), ctype), + )) #: Global registry of serializers/deserializers.