From 1cb797cc7f0ed8258ed84803825ceecc244055b2 Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Tue, 10 Jan 2017 07:12:09 +0100
Subject: [PATCH] lol idk
---
coolamqp/framing/compilation/utilities.py | 2 +-
coolamqp/framing/definitions.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/coolamqp/framing/compilation/utilities.py b/coolamqp/framing/compilation/utilities.py
index 62ce740..f35b381 100644
--- a/coolamqp/framing/compilation/utilities.py
+++ b/coolamqp/framing/compilation/utilities.py
@@ -169,7 +169,7 @@ def frepr(p, sop=six.text_type):
p = sop(p)
s = repr(p)
- if isinstance(p, basestring) and not s.startswith('u'):
+ if isinstance(p, (six.binary_type, six.text_type)) and not s.startswith('u'):
return ('u' if sop == six.text_type else 'b') + s
else:
return s
diff --git a/coolamqp/framing/definitions.py b/coolamqp/framing/definitions.py
index ff63f68..e387a50 100644
--- a/coolamqp/framing/definitions.py
+++ b/coolamqp/framing/definitions.py
@@ -2438,7 +2438,7 @@ class BasicContentPropertyList(AMQPContentPropertyList):
if zpf in BasicContentPropertyList.PARTICULAR_CLASSES:
return BasicContentPropertyList.PARTICULAR_CLASSES[zpf].from_buffer(buf, offset)
else:
- logger.debug(u'Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
+ logger.debug('Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
c = compile_particular_content_property_list_class(zpf, BasicContentPropertyList.FIELDS)
BasicContentPropertyList.PARTICULAR_CLASSES[zpf] = c
return c.from_buffer(buf, offset)
--
GitLab