Conflicts:
pyfpdb/Charset.py
This commit is contained in:
parent
3a03bc51a2
commit
7737720aa8
|
@ -33,8 +33,7 @@ def to_utf8(s):
|
||||||
if not_needed: return s
|
if not_needed: return s
|
||||||
|
|
||||||
try:
|
try:
|
||||||
#(_out, _len) = encoder_to_utf.encode(s)
|
(_out, _len) = encoder_to_utf.encode(s)
|
||||||
_out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
|
|
||||||
return _out
|
return _out
|
||||||
except UnicodeDecodeError:
|
except UnicodeDecodeError:
|
||||||
print 'Could not convert: "%s"' % s
|
print 'Could not convert: "%s"' % s
|
||||||
|
|
Loading…
Reference in New Issue
Block a user