openstack/zaqar
Code Issues Proposed changes

Use oslo.utils.encodeutils instead of strutils

Browse Source 
Change-Id: Id8adb40a88d1bbaacbb75e2eeafd723d92d7de29
This commit is contained in:
Flavio Percoco 2014-09-03 10:26:57 +02:00
parent 89ee4ce263
commit a18b4e606d
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zaqar/queues/storage/redis/messages.py
View File

@ -15,11 +15,11 @@
import functools import functools
import uuid import uuid
from oslo.utils import encodeutils
from oslo.utils import timeutils from oslo.utils import timeutils
import redis import redis
from zaqar.common import decorators from zaqar.common import decorators
from zaqar.openstack.common import strutils
from zaqar.queues import storage from zaqar.queues import storage
from zaqar.queues.storage import errors from zaqar.queues.storage import errors
from zaqar.queues.storage.redis import models from zaqar.queues.storage.redis import models
@ -215,7 +215,7 @@ class MessageController(storage.Message):
info = { info = {
# NOTE(kgriffs): A "None" claim is serialized as an empty str # NOTE(kgriffs): A "None" claim is serialized as an empty str
'id': strutils.safe_decode(claim[0]) or None, 'id': encodeutils.safe_decode(claim[0]) or None,
'expires': int(claim[1]), 'expires': int(claim[1]),
} }
@ -310,7 +310,7 @@ class MessageController(storage.Message):
offset_msgsets += len(msgset_keys) offset_msgsets += len(msgset_keys)
for msgset_key in msgset_keys: for msgset_key in msgset_keys:
msgset_key = strutils.safe_decode(msgset_key) msgset_key = encodeutils.safe_decode(msgset_key)
# NOTE(kgriffs): Drive the claim controller GC from # NOTE(kgriffs): Drive the claim controller GC from
# here, because we already know the queue and project # here, because we already know the queue and project

9
zaqar/queues/storage/redis/models.py
View File

@ -16,10 +16,9 @@ import functools
import uuid import uuid
import msgpack import msgpack
from oslo.utils import encodeutils
from oslo.utils import timeutils from oslo.utils import timeutils
from zaqar.openstack.common import strutils
_pack = msgpack.Packer(encoding='utf-8', use_bin_type=True).pack _pack = msgpack.Packer(encoding='utf-8', use_bin_type=True).pack
_unpack = functools.partial(msgpack.unpackb, encoding='utf-8') _unpack = functools.partial(msgpack.unpackb, encoding='utf-8')
@ -76,19 +75,19 @@ class Message(object):
def from_redis(doc): def from_redis(doc):
claim_id = doc[b'c'] claim_id = doc[b'c']
if claim_id: if claim_id:
claim_id = strutils.safe_decode(claim_id) claim_id = encodeutils.safe_decode(claim_id)
else: else:
claim_id = None claim_id = None
# NOTE(kgriffs): Under Py3K, redis-py converts all strings # NOTE(kgriffs): Under Py3K, redis-py converts all strings
# into binary. Woohoo! # into binary. Woohoo!
return Message( return Message(
id=strutils.safe_decode(doc[b'id']), id=encodeutils.safe_decode(doc[b'id']),
ttl=int(doc[b't']), ttl=int(doc[b't']),
created=int(doc[b'cr']), created=int(doc[b'cr']),
expires=int(doc[b'e']), expires=int(doc[b'e']),
client_uuid=strutils.safe_decode(doc[b'u']), client_uuid=encodeutils.safe_decode(doc[b'u']),
claim_id=claim_id, claim_id=claim_id,
claim_expires=int(doc[b'c.e']), claim_expires=int(doc[b'c.e']),

4
zaqar/queues/storage/redis/utils.py
View File

@ -17,12 +17,12 @@ import sys
import time import time
import uuid import uuid
from oslo.utils import encodeutils
import redis import redis
import six import six
from zaqar.i18n import _ from zaqar.i18n import _
from zaqar.openstack.common import log as logging from zaqar.openstack.common import log as logging
from zaqar.openstack.common import strutils
from zaqar.queues.storage import errors from zaqar.queues.storage import errors
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -198,7 +198,7 @@ class QueueListCursor(object):
def next(self): def next(self):
curr = next(self.queue_iter) curr = next(self.queue_iter)
queue = self.client.hmget(curr, ['c', 'm']) queue = self.client.hmget(curr, ['c', 'm'])
return self.denormalizer(queue, strutils.safe_decode(curr)) return self.denormalizer(queue, encodeutils.safe_decode(curr))
def __next__(self): def __next__(self):
return self.next() return self.next()