Merge branch 'master' of git://git.assembla.com/fpdb-eric

2010-01-29 12:06:44 -05:00
parent 8fd2f8b82f e56cb24ed1
commit 1aa68a9075
1 changed files with 2 additions and 1 deletions
@@ -42,6 +42,8 @@ def to_utf8(s):
    except UnicodeDecodeError:
        sys.stderr.write('Could not convert: "%s"\n' % s)
        raise
+    except TypeError: # TypeError is raised when we give unicode() an already encoded string
+        return s

 def to_db_utf8(s):
    if not_needed: return s
@@ -62,4 +64,3 @@ def to_gui(s):
    except UnicodeDecodeError:
        sys.stderr.write('Could not convert: "%s"\n' % s)
        raise
-