Spell module: fix encoding problem

modules/spell/__init__.py

@@ -80,10 +80,10 @@ def cmd_score(msg):
     return res
 
 def check_spell(word, lang='fr'):
-    a = Aspell(("lang", lang))
-    if a.check(word):
+    a = Aspell([("lang", lang), ("lang", "fr")])
+    if a.check(word.encode("iso-8859-15")):
         ret = True
     else:
-        ret = a.suggest(word)
+        ret = a.suggest(word.encode("iso-8859-15"))
     a.close()
     return ret

modules/spell/pyaspell.py

@@ -37,10 +37,10 @@ try:
 	bytes
 
 	def _to_bytes(s):
-		return s.encode()
+		return s.encode("ISO-8859-15")
 
 	def _from_bytes(s):
-		return s.decode()
+		return s.decode("ISO-8859-15")
 
 except NameError:
 	def _to_bytes(s):
@@ -109,15 +109,12 @@ class AspellLinux(object):
 		Check if word is present in main, personal or session
 		dictionary.  Boolean value is returned
 		"""
-		if type(word) is str:
-			return bool(
-				self.__lib.aspell_speller_check(
-					self.__speller,
-					_to_bytes(word),
-					len(word)
+		return bool(
+			self.__lib.aspell_speller_check(
+				self.__speller,
+				word,
+				len(word)
 				))
-		else:
-			raise TypeError("String expected")
 
 
 	__contains__ = check
@@ -128,15 +125,12 @@ class AspellLinux(object):
 		Return list of spelling suggestions of given word.
 		Works even if word is correct.
 		"""
-		if type(word) is str:
-			return self._aspellwordlist(
-				self.__lib.aspell_speller_suggest(
-					self.__speller,
-					_to_bytes(word),
-					len(word)
+		return self._aspellwordlist(
+			self.__lib.aspell_speller_suggest(
+				self.__speller,
+				word,
+				len(word)
 				))
-		else:
-			raise TypeError("String expected")
 
 
 	def personal_dict(self, word=None):