openstack/zaqar
Code Issues Proposed changes

Fix the incompatibility for python3

Browse Source 
Change-Id: I1c6c0cb37819f93aa6f2a46508519fb9470f80f6
This commit is contained in:
wanghao 2019-12-20 15:39:37 +08:00
parent 55c73e22ca
commit 0c952ebe29
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zaqar/storage/redis/models.py
View File

@ -157,8 +157,8 @@ class SubscriptionEnvelope(object):
is_confirmed = self.confirmed == str(True)
basic_msg = {
'id': self.id,
'source': self.source,
'subscriber': self.subscriber,
'source': self.source.decode(),
'subscriber': self.subscriber.decode(),
'ttl': self.ttl,
'age': now - created,
'options': self.options,

10
zaqar/storage/redis/subscriptions.py
View File

@ -79,12 +79,12 @@ class SubscriptionController(base.Subscription):
is_confirmed = record[5]
ret = {
'id': sid,
'source': record[0],
'subscriber': record[1],
'source': record[0].decode(),
'subscriber': record[1].decode(),
'ttl': ttl,
'age': now - created,
'options': self._unpacker(record[4]),
'confirmed': is_confirmed,
'confirmed': is_confirmed.decode(),
}
marker_next['next'] = sid
@ -168,7 +168,7 @@ class SubscriptionController(base.Subscription):
# the subscription but the id is still there. So let's
# delete the id for clean up.
self._client.zrem(subset_key, s_id)
if subscription[1] == subscriber:
if subscription[1].decode() == subscriber:
return True
return False
except redis.exceptions.ResponseError:
@ -252,7 +252,7 @@ class SubscriptionController(base.Subscription):
for s_id in sub_ids:
subscription = self._client.hmget(s_id,
['s', 'u', 't', 'o', 'c'])
if subscription[1] == subscriber:
if subscription[1].decode() == subscriber:
subscription = SubscriptionEnvelope.from_redis(s_id,
self._client)
now = timeutils.utcnow_ts()

2
zaqar/storage/swift/claims.py
View File

@ -224,7 +224,7 @@ class ClaimController(storage.Claim):
except errors.MessageDoesNotExist:
continue
md5 = hashlib.md5()
md5.update(msg.encode('utf-8'))
md5.update(msg)
md5 = md5.hexdigest()
msg = jsonutils.loads(msg)
content = jsonutils.dumps(