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

to_utf8 returns what was passed in if unicode() errors because it's already encoded

Browse Source
This commit is contained in:
Eric Blade 2010-01-29 12:01:51 -05:00
parent 23e0611978
commit e56cb24ed1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyfpdb/Charset.py
View File

@ -42,6 +42,8 @@ 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 TypeError: # TypeError is raised when we give unicode() an already encoded string
return s
def to_db_utf8(s): def to_db_utf8(s):
if not_needed: return s if not_needed: return s
@ -62,4 +64,3 @@ def to_gui(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