From e1d0ab2774fd0ebe953b71e127b80d2e66612bf2 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Sat, 17 Aug 2013 16:11:52 +0200
Subject: [PATCH] Aka: Fix support for non-ascii commands name with Python 2
 (bug introduced in 64300b8a02).

---
 plugins/Aka/plugin.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/Aka/plugin.py b/plugins/Aka/plugin.py
index 535ee35a5..27badecb1 100644
--- a/plugins/Aka/plugin.py
+++ b/plugins/Aka/plugin.py
@@ -100,9 +100,9 @@ if sqlalchemy:
 
 
         def has_aka(self, channel, name):
+            name = callbacks.canonicalName(name)
             if sys.version_info[0] < 3 and isinstance(name, str):
                 name = name.decode('utf8')
-            name = callbacks.canonicalName(name)
             count = self.get_db(channel).query(Alias) \
                     .filter(Alias.name == name) \
                     .count()
@@ -112,9 +112,9 @@ if sqlalchemy:
             return list_
 
         def get_alias(self, channel, name):
+            name = callbacks.canonicalName(name)
             if sys.version_info[0] < 3 and isinstance(name, str):
                 name = name.decode('utf8')
-            name = callbacks.canonicalName(name)
             try:
                 return self.get_db(channel).query(Alias.alias) \
                         .filter(Alias.name == name).one()[0]
@@ -135,17 +135,17 @@ if sqlalchemy:
             db.commit()
 
         def remove_aka(self, channel, name):
+            name = callbacks.canonicalName(name)
             if sys.version_info[0] < 3 and isinstance(name, str):
                 name = name.decode('utf8')
-            name = callbacks.canonicalName(name)
             db = self.get_db(channel)
             db.query(Alias).filter(Alias.name == name).delete()
             db.commit()
 
         def lock_aka(self, channel, name, by):
+            name = callbacks.canonicalName(name)
             if sys.version_info[0] < 3 and isinstance(name, str):
                 name = name.decode('utf8')
-            name = callbacks.canonicalName(name)
             db = self.get_db(channel)
             try:
                 aka = db.query(Alias) \
@@ -160,9 +160,9 @@ if sqlalchemy:
             db.commit()
 
         def unlock_aka(self, channel, name, by):
+            name = callbacks.canonicalName(name)
             if sys.version_info[0] < 3 and isinstance(name, str):
                 name = name.decode('utf8')
-            name = callbacks.canonicalName(name)
             db = self.get_db(channel)
             try:
                 aka = db.query(Alias) \
@@ -177,9 +177,9 @@ if sqlalchemy:
             db.commit()
 
         def get_aka_lock(self, channel, name):
+            name = callbacks.canonicalName(name)
             if sys.version_info[0] < 3 and isinstance(name, str):
                 name = name.decode('utf8')
-            name = callbacks.canonicalName(name)
             try:
                 return self.get_db(channel) \
                         .query(Alias.locked, Alias.locked_by, Alias.locked_at)\