opendev/system-config
Code Issues Proposed changes

Decode key returned from db into unicode.

Browse Source 
We get this error in cron:

/usr/local/gerrit/scripts/update_gerrit_users.py:339: UnicodeWarning:
Unicode equal comparison failed to convert both arguments to Unicode -
interpreting them as being unequal
  if key.strip() not in db_keys:

The stuff from Launchpad comes back as unicode, but the stuff from MySQL
comes back as string, which makes the in comparison wonky.

Perhaps we should upgrade the database to unicode properly as well...

Change-Id: I5ef66763429ca490d799ebb5b030abdc4d5de67e
This commit is contained in:
Monty Taylor 2012-05-26 12:00:29 -04:00
parent b78fec71e6
commit 9e63f0b303
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gerrit/files/scripts/update_gerrit_users.py
View File

@ -335,7 +335,7 @@ for (username, user_details) in users.items():
cur.execute("""select ssh_public_key from account_ssh_keys where
account_id = %s""", account_id)
db_keys = [r[0].strip() for r in cur.fetchall()]
db_keys = [r[0].strip().decode('utf-8') for r in cur.fetchall()]
if key.strip() not in db_keys:
cur.execute("""select max(seq)+1 from account_ssh_keys