From dda00b6b10ff4dcc32b22b24853e9e973f5e38cc Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:31:19 +0200
Subject: [PATCH] Catch character encoding errors

---
 pyfpdb/Charset.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 85cbd69a..69511cdd 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -31,11 +31,21 @@ if Configuration.LOCALE_ENCODING == 'utf-8':
 
 def to_utf8(s):
     if not_needed: return s
-    (_out, _len) = encoder_to_utf.encode(s)
-    return _out
+
+    try:
+        (_out, _len) = encoder_to_utf.encode(s)
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
 
 def to_gui(s):
     if not_needed: return s
-    (_out, _len) = encoder_to_sys.encode(s)
-    return _out
+
+    try:
+        (_out, _len) = encoder_to_sys.encode(s)
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise