# HG changeset patch
# User Charly COSTE <changaco@changaco.net>
# Date 1268069993 -3600
# Node ID 5e65f52be453f3a43d0078aaf4fb8415536a375f
# Parent  cf4f00441628f9e86051a4774dacca9db2bb00b0
make sure Bot.error doesn't raise a transcoding exception and uses repr() when there is a problem

Signed-off-by: Charly COSTE <changaco@changaco.net>

diff --git a/bot.py b/bot.py
--- a/bot.py
+++ b/bot.py
@@ -64,6 +64,10 @@ class Bot(threading.Thread):
 	
 	def error(self, importance, message, debug=False, no_debug_add='', send_to_admins=False):
 		"""Output an error message."""
+		try:
+			message = message.encode('utf-8')
+		except:
+			message = repr(message)
 		if not self.debug:
 			 message += no_debug_add
 		if send_to_admins == True:
@@ -71,9 +75,9 @@ class Bot(threading.Thread):
 		if importance == -1:
 			return
 		if not debug:
-			self.error_fd.write(self.format_message(importance, message).encode('utf-8')+'\n')
+			self.error_fd.write(self.format_message(importance, message)+'\n')
 		elif self.debug:
-			self.error_fd.write('='*importance+'> '+message.encode('utf-8')+'\n')
+			self.error_fd.write('='*importance+'> '+message+'\n')
 	
 	
 	def _xmpp_loop(self):