diff --git a/coolamqp/attaches/agroup.py b/coolamqp/attaches/agroup.py index 3ccc032a85ed6b64e11e12e7218d72380ff4e775..d47cbf2230f0d014a2b65e07bffe61ddb139e3ca 100644 --- a/coolamqp/attaches/agroup.py +++ b/coolamqp/attaches/agroup.py @@ -67,6 +67,6 @@ class AttacheGroup(Attache): if not attache.cancelled: attache.attach(connection) else: - raise Exception + raise Exception(u'I should not have found a cancelled attache here...') diff --git a/coolamqp/framing/compilation/utilities.py b/coolamqp/framing/compilation/utilities.py index 2504eab9b23dcf1f20d5889bbfafb47e62d884df..62ce740b7c55af44ec04ac318db644f2f8625685 100644 --- a/coolamqp/framing/compilation/utilities.py +++ b/coolamqp/framing/compilation/utilities.py @@ -165,7 +165,7 @@ def format_field_name(field): return field.replace('-', '_') def frepr(p, sop=six.text_type): - if isinstance(p, basestring): + if isinstance(p, (six.binary_type, six.text_type)): p = sop(p) s = repr(p) diff --git a/coolamqp/framing/extensions.py b/coolamqp/framing/extensions.py deleted file mode 100644 index 355ed0fc9ce824327970ff7786abef24d4133fc5..0000000000000000000000000000000000000000 --- a/coolamqp/framing/extensions.py +++ /dev/null @@ -1,5 +0,0 @@ -# coding=UTF-8 -from __future__ import absolute_import, division, print_function -"""Extension definitions""" - -PUBLISHER_CONFIRMS = b'publisher_confirms' \ No newline at end of file