Skip to content
Snippets Groups Projects
Commit 9a12eefe authored by Piotr Maślanka's avatar Piotr Maślanka
Browse files

fixes #3

parent 3abdfb2b
No related branches found
No related tags found
No related merge requests found
Pipeline #63414 failed with stages
in 2 minutes and 7 seconds
...@@ -27,6 +27,8 @@ def toutf8(q): ...@@ -27,6 +27,8 @@ def toutf8(q):
def tobytes(q): def tobytes(q):
if isinstance(q, memoryview):
return q.tobytes()
return q.encode('utf-8') if isinstance(q, six.text_type) else q return q.encode('utf-8') if isinstance(q, six.text_type) else q
...@@ -287,8 +289,7 @@ class Queue(object): ...@@ -287,8 +289,7 @@ class Queue(object):
if name is None: if name is None:
self.name = None self.name = None
else: else:
name = uuid.uuid4().hex if not name else name self.name = tobytes(uuid.uuid4().hex if not name else name)
self.name = tobytes(name)
self.durable = durable self.durable = durable
self.exchange = exchange self.exchange = exchange
......
# coding=UTF-8 # coding=UTF-8
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
import sys
import logging import logging
import unittest import unittest
import io import io
...@@ -13,6 +14,7 @@ from coolamqp.objects import NodeDefinition, MessageProperties, Queue, argumenti ...@@ -13,6 +14,7 @@ from coolamqp.objects import NodeDefinition, MessageProperties, Queue, argumenti
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logging.getLogger('coolamqp').setLevel(logging.DEBUG) logging.getLogger('coolamqp').setLevel(logging.DEBUG)
IS_PY3 = sys.version.startswith('3')
class TestObjects(unittest.TestCase): class TestObjects(unittest.TestCase):
...@@ -26,9 +28,10 @@ class TestObjects(unittest.TestCase): ...@@ -26,9 +28,10 @@ class TestObjects(unittest.TestCase):
with warnings.catch_warnings(record=True) as w: with warnings.catch_warnings(record=True) as w:
Queue('test', auto_delete=True, exclusive=True) Queue('test', auto_delete=True, exclusive=True)
Queue(auto_delete=True, exclusive=False) Queue(auto_delete=True, exclusive=False)
self.assertEqual(len(w), 2) self.assertEqual(len(w), 2 if IS_PY3 else 1)
self.assertTrue(issubclass(w[0].category, UserWarning)) self.assertTrue(issubclass(w[0].category, UserWarning))
self.assertTrue(issubclass(w[1].category, DeprecationWarning)) if IS_PY3:
self.assertTrue(issubclass(w[1].category, DeprecationWarning))
def test_queue_declare(self): def test_queue_declare(self):
args = argumentify({'x-dead-letter-exchange': 'deadletter', args = argumentify({'x-dead-letter-exchange': 'deadletter',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment