Conflicts:

pyfpdb/Charset.py
2010-01-23 16:35:57 +01:00 · 2010-01-23 16:35:57 +01:00 · 7737720aa8
commit 7737720aa8
parent 3a03bc51a2
1 changed files with 1 additions and 2 deletions
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@ -33,8 +33,7 @@ def to_utf8(s):
    if not_needed: return s

    try:
-        #(_out, _len) = encoder_to_utf.encode(s)
-        _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
+        (_out, _len) = encoder_to_utf.encode(s)
        return _out
    except UnicodeDecodeError:
        print 'Could not convert: "%s"' % s