Skip to content

Commit 99ca128

Browse files
author
Nathan Beittenmiller
committed
Merge pull request softlayer#328 from sudorandom/message-queue-bytes
Fixes messaging byte json loading issue
2 parents 95d7e22 + 064909b commit 99ca128

2 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎SoftLayer/managers/messaging.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def stats(self, period='hour'):
187187
:param period: 'hour', 'day', 'week', 'month'
188188
"""
189189
resp = self._make_request('get', 'stats/%s' % period)
190-
return json.loads(resp.content)
190+
return resp.json()
191191

192192
# QUEUE METHODS
193193

@@ -200,7 +200,7 @@ def get_queues(self, tags=None):
200200
if tags:
201201
params['tags'] = ','.join(tags)
202202
resp = self._make_request('get', 'queues', params=params)
203-
return json.loads(resp.content)
203+
return resp.json()
204204

205205
def create_queue(self, queue_name, **kwargs):
206206
""" Create Queue
@@ -212,7 +212,7 @@ def create_queue(self, queue_name, **kwargs):
212212
queue.update(kwargs)
213213
data = json.dumps(queue)
214214
resp = self._make_request('put', 'queues/%s' % queue_name, data=data)
215-
return json.loads(resp.content)
215+
return resp.json()
216216

217217
def modify_queue(self, queue_name, **kwargs):
218218
""" Modify Queue
@@ -228,7 +228,7 @@ def get_queue(self, queue_name):
228228
:param queue_name: Queue Name
229229
"""
230230
resp = self._make_request('get', 'queues/%s' % queue_name)
231-
return json.loads(resp.content)
231+
return resp.json()
232232

233233
def delete_queue(self, queue_name, force=False):
234234
""" Delete Queue
@@ -254,7 +254,7 @@ def push_queue_message(self, queue_name, body, **kwargs):
254254
message.update(kwargs)
255255
resp = self._make_request('post', 'queues/%s/messages' % queue_name,
256256
data=json.dumps(message))
257-
return json.loads(resp.content)
257+
return resp.json()
258258

259259
def pop_messages(self, queue_name, count=1):
260260
""" Pop messages from a queue
@@ -264,7 +264,7 @@ def pop_messages(self, queue_name, count=1):
264264
"""
265265
resp = self._make_request('get', 'queues/%s/messages' % queue_name,
266266
params={'batch': count})
267-
return json.loads(resp.content)
267+
return resp.json()
268268

269269
def pop_message(self, queue_name):
270270
""" Pop a single message from a queue. If no messages are returned
@@ -299,7 +299,7 @@ def get_topics(self, tags=None):
299299
if tags:
300300
params['tags'] = ','.join(tags)
301301
resp = self._make_request('get', 'topics', params=params)
302-
return json.loads(resp.content)
302+
return resp.json()
303303

304304
def create_topic(self, topic_name, **kwargs):
305305
""" Create Topic
@@ -309,7 +309,7 @@ def create_topic(self, topic_name, **kwargs):
309309
"""
310310
data = json.dumps(kwargs)
311311
resp = self._make_request('put', 'topics/%s' % topic_name, data=data)
312-
return json.loads(resp.content)
312+
return resp.json()
313313

314314
def modify_topic(self, topic_name, **kwargs):
315315
""" Modify Topic
@@ -325,7 +325,7 @@ def get_topic(self, topic_name):
325325
:param topic_name: Topic Name
326326
"""
327327
resp = self._make_request('get', 'topics/%s' % topic_name)
328-
return json.loads(resp.content)
328+
return resp.json()
329329

330330
def delete_topic(self, topic_name, force=False):
331331
""" Delete Topic
@@ -351,7 +351,7 @@ def push_topic_message(self, topic_name, body, **kwargs):
351351
message.update(kwargs)
352352
resp = self._make_request('post', 'topics/%s/messages' % topic_name,
353353
data=json.dumps(message))
354-
return json.loads(resp.content)
354+
return resp.json()
355355

356356
def get_subscriptions(self, topic_name):
357357
""" Listing of subscriptions on a topic
@@ -360,7 +360,7 @@ def get_subscriptions(self, topic_name):
360360
"""
361361
resp = self._make_request('get',
362362
'topics/%s/subscriptions' % topic_name)
363-
return json.loads(resp.content)
363+
return resp.json()
364364

365365
def create_subscription(self, topic_name, subscription_type, **kwargs):
366366
""" Create Subscription
@@ -373,7 +373,7 @@ def create_subscription(self, topic_name, subscription_type, **kwargs):
373373
'post', 'topics/%s/subscriptions' % topic_name,
374374
data=json.dumps({
375375
'endpoint_type': subscription_type, 'endpoint': kwargs}))
376-
return json.loads(resp.content)
376+
return resp.json()
377377

378378
def delete_subscription(self, topic_name, subscription_id):
379379
""" Delete a subscription

‎SoftLayer/tests/managers/queue_tests.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def test_stats(self, make_request):
241241
content = {
242242
'notifications': [{'key': [2012, 7, 27, 14, 31], 'value': 2}],
243243
'requests': [{'key': [2012, 7, 27, 14, 31], 'value': 11}]}
244-
make_request().content = json.dumps(content)
244+
make_request().json.return_value = content
245245
result = self.conn.stats()
246246

247247
make_request.assert_called_with('get', 'stats/hour')
@@ -250,7 +250,7 @@ def test_stats(self, make_request):
250250
# Queue-based Tests
251251
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
252252
def test_get_queues(self, make_request):
253-
make_request().content = json.dumps(QUEUE_LIST)
253+
make_request().json.return_value = QUEUE_LIST
254254
result = self.conn.get_queues()
255255

256256
make_request.assert_called_with('get', 'queues', params={})
@@ -265,7 +265,7 @@ def test_get_queues(self, make_request):
265265

266266
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
267267
def test_create_queue(self, make_request):
268-
make_request().content = json.dumps(QUEUE_1)
268+
make_request().json.return_value = QUEUE_1
269269
result = self.conn.create_queue('example_queue')
270270

271271
make_request.assert_called_with(
@@ -274,7 +274,7 @@ def test_create_queue(self, make_request):
274274

275275
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
276276
def test_modify_queue(self, make_request):
277-
make_request().content = json.dumps(QUEUE_1)
277+
make_request().json.return_value = QUEUE_1
278278
result = self.conn.modify_queue('example_queue')
279279

280280
make_request.assert_called_with(
@@ -283,7 +283,7 @@ def test_modify_queue(self, make_request):
283283

284284
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
285285
def test_get_queue(self, make_request):
286-
make_request().content = json.dumps(QUEUE_1)
286+
make_request().json.return_value = QUEUE_1
287287
result = self.conn.get_queue('example_queue')
288288

289289
make_request.assert_called_with('get', 'queues/example_queue')
@@ -304,7 +304,7 @@ def test_delete_queue(self, make_request):
304304

305305
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
306306
def test_push_queue_message(self, make_request):
307-
make_request().content = json.dumps(MESSAGE_1)
307+
make_request().json.return_value = MESSAGE_1
308308
result = self.conn.push_queue_message('example_queue', '<body>')
309309

310310
make_request.assert_called_with(
@@ -313,7 +313,7 @@ def test_push_queue_message(self, make_request):
313313

314314
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
315315
def test_pop_messages(self, make_request):
316-
make_request().content = json.dumps(MESSAGE_POP)
316+
make_request().json.return_value = MESSAGE_POP
317317
result = self.conn.pop_messages('example_queue')
318318

319319
make_request.assert_called_with(
@@ -322,7 +322,7 @@ def test_pop_messages(self, make_request):
322322

323323
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
324324
def test_pop_message(self, make_request):
325-
make_request().content = json.dumps(MESSAGE_POP)
325+
make_request().json.return_value = MESSAGE_POP
326326
result = self.conn.pop_message('example_queue')
327327

328328
make_request.assert_called_with(
@@ -331,7 +331,7 @@ def test_pop_message(self, make_request):
331331

332332
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
333333
def test_pop_message_empty(self, make_request):
334-
make_request().content = json.dumps(MESSAGE_POP_EMPTY)
334+
make_request().json.return_value = MESSAGE_POP_EMPTY
335335
result = self.conn.pop_message('example_queue')
336336

337337
make_request.assert_called_with(
@@ -349,7 +349,7 @@ def test_delete_message(self, make_request):
349349
# Topic-based Tests
350350
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
351351
def test_get_topics(self, make_request):
352-
make_request().content = json.dumps(TOPIC_LIST)
352+
make_request().json.return_value = TOPIC_LIST
353353
result = self.conn.get_topics()
354354

355355
make_request.assert_called_with('get', 'topics', params={})
@@ -364,7 +364,7 @@ def test_get_topics(self, make_request):
364364

365365
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
366366
def test_create_topic(self, make_request):
367-
make_request().content = json.dumps(TOPIC_1)
367+
make_request().json.return_value = TOPIC_1
368368
result = self.conn.create_topic('example_topic')
369369

370370
make_request.assert_called_with(
@@ -373,7 +373,7 @@ def test_create_topic(self, make_request):
373373

374374
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
375375
def test_modify_topic(self, make_request):
376-
make_request().content = json.dumps(TOPIC_1)
376+
make_request().json.return_value = TOPIC_1
377377
result = self.conn.modify_topic('example_topic')
378378

379379
make_request.assert_called_with(
@@ -382,7 +382,7 @@ def test_modify_topic(self, make_request):
382382

383383
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
384384
def test_get_topic(self, make_request):
385-
make_request().content = json.dumps(TOPIC_1)
385+
make_request().json.return_value = TOPIC_1
386386
result = self.conn.get_topic('example_topic')
387387

388388
make_request.assert_called_with('get', 'topics/example_topic')
@@ -403,7 +403,7 @@ def test_delete_topic(self, make_request):
403403

404404
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
405405
def test_push_topic_message(self, make_request):
406-
make_request().content = json.dumps(MESSAGE_1)
406+
make_request().json.return_value = MESSAGE_1
407407
result = self.conn.push_topic_message('example_topic', '<body>')
408408

409409
make_request.assert_called_with(
@@ -412,7 +412,7 @@ def test_push_topic_message(self, make_request):
412412

413413
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
414414
def test_get_subscriptions(self, make_request):
415-
make_request().content = json.dumps(SUBSCRIPTION_LIST)
415+
make_request().json.return_value = SUBSCRIPTION_LIST
416416
result = self.conn.get_subscriptions('example_topic')
417417

418418
make_request.assert_called_with(
@@ -421,7 +421,7 @@ def test_get_subscriptions(self, make_request):
421421

422422
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
423423
def test_create_subscription(self, make_request):
424-
make_request().content = json.dumps(SUBSCRIPTION_1)
424+
make_request().json.return_value = SUBSCRIPTION_1
425425
endpoint_details = {
426426
'account_id': 'test',
427427
'queue_name': 'topic_subscription_queue'}
@@ -436,7 +436,7 @@ def test_create_subscription(self, make_request):
436436

437437
@patch('SoftLayer.managers.messaging.MessagingConnection._make_request')
438438
def test_delete_subscription(self, make_request):
439-
make_request().content = json.dumps(SUBSCRIPTION_1)
439+
make_request().json.return_value = SUBSCRIPTION_1
440440
result = self.conn.delete_subscription(
441441
'example_topic', SUBSCRIPTION_1['id'])
442442

0 commit comments

Comments
 (0)