Merge "Encode user_id and email before dumping them"

This commit is contained in:
Jenkins
2015-04-16 15:55:32 +00:00
committed by Gerrit Code Review

View File

@@ -131,7 +131,8 @@ def export_data(memcached_inst, fd):
user = memcached_inst.get('user:%s' % user_seq) user = memcached_inst.get('user:%s' % user_seq)
if user: if user:
if user.get('user_id'): if user.get('user_id'):
pickle.dump(('user:%s' % user['user_id'], user), fd) pickle.dump((('user:%s' % user['user_id']).encode('utf8'),
user), fd)
if user.get('launchpad_id'): if user.get('launchpad_id'):
pickle.dump(('user:%s' % user['launchpad_id'], user), fd) pickle.dump(('user:%s' % user['launchpad_id'], user), fd)
if user.get('gerrit_id'): if user.get('gerrit_id'):
@@ -139,7 +140,7 @@ def export_data(memcached_inst, fd):
if user.get('member_id'): if user.get('member_id'):
pickle.dump(('user:member:%s' % user['member_id'], user), fd) pickle.dump(('user:member:%s' % user['member_id'], user), fd)
for email in user.get('emails') or []: for email in user.get('emails') or []:
pickle.dump(('user:%s' % email, user), fd) pickle.dump((('user:%s' % email).encode('utf8'), user), fd)
def _connect_to_memcached(uri): def _connect_to_memcached(uri):