evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be more tolerant of errors when translating for gui, add encode exception handlers

Browse Source
This commit is contained in:
sqlcoder 2010-02-06 23:12:11 +00:00
parent 4ecd713dab
commit ef26c05181
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pyfpdb/Charset.py
View File

@ -42,6 +42,9 @@ def to_utf8(s):
except UnicodeDecodeError: except UnicodeDecodeError:
sys.stderr.write('Could not convert: "%s"\n' % s) sys.stderr.write('Could not convert: "%s"\n' % s)
raise raise
except UnicodeEncodeError:
sys.stderr.write('Could not encode: "%s"\n' % s)
raise
except TypeError: # TypeError is raised when we give unicode() an already encoded string except TypeError: # TypeError is raised when we give unicode() an already encoded string
return s return s
@ -54,13 +57,21 @@ def to_db_utf8(s):
except UnicodeDecodeError: except UnicodeDecodeError:
sys.stderr.write('Could not convert: "%s"\n' % s) sys.stderr.write('Could not convert: "%s"\n' % s)
raise raise
except UnicodeEncodeError:
sys.stderr.write('Could not encode: "%s"\n' % s)
raise
def to_gui(s): def to_gui(s):
if not_needed3: return s if not_needed3: return s
try: try:
(_out, _len) = encoder_to_sys.encode(s) # we usually don't want to use 'replace' but this is only for displaying
# in the gui so it doesn't matter if names are missing an accent or two
(_out, _len) = encoder_to_sys.encode(s, 'replace')
return _out return _out
except UnicodeDecodeError: except UnicodeDecodeError:
sys.stderr.write('Could not convert: "%s"\n' % s) sys.stderr.write('Could not convert: "%s"\n' % s)
raise raise
except UnicodeEncodeError:
sys.stderr.write('Could not encode: "%s"\n' % s)
raise