From 352b80f923239bcf6082c7e1c28e94d2a2913a37 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 27 May 2012 16:16:55 +0000
Subject: [PATCH] Revert "Decode key returned from db into unicode."
This reverts commit 9e63f0b303951da12dd4d96e9842b6c191763522
---
modules/gerrit/files/scripts/update_gerrit_users.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gerrit/files/scripts/update_gerrit_users.py b/modules/gerrit/files/scripts/update_gerrit_users.py
index 8fd3a28aa2..15baaa9b79 100755
--- a/modules/gerrit/files/scripts/update_gerrit_users.py
+++ b/modules/gerrit/files/scripts/update_gerrit_users.py
@@ -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().decode('utf-8') for r in cur.fetchall()]
+ db_keys = [r[0].strip() for r in cur.fetchall()]
if key.strip() not in db_keys:
cur.execute("""select max(seq)+1 from account_ssh_keys