Fix encoding issues with Alias containing non-ascii characters.

plugins/Alias/test.py

@@ -68,6 +68,8 @@ class AliasTestCase(ChannelPluginTestCase):
     def testAliasHelp(self):
         self.assertNotError('alias add slashdot foo')
         self.assertRegexp('help slashdot', "Alias for .*foo")
+        self.assertNotError('alias add nonascii echo éé')
+        self.assertRegexp('help nonascii', "Alias for .*echo éé")
 
     def testRemove(self):
         self.assertNotError('alias add foo echo bar')

src/utils/str.py

@@ -444,10 +444,12 @@ def format(s, *args, **kwargs):
         char = match.group(1)
         if char == 's':
             token = args.pop()
-            if isinstance(token, unicode) or isinstance(token, str):
+            if isinstance(token, str):
                 return token
+            elif sys.version_info[0] < 3 and isinstance(token, unicode):
+                return token.encode('utf8')
             else:
-                return unicode(token)
+                return str(token)
         elif char == 'i':
             # XXX Improve me!
             return str(args.pop())