From 4ef01c2820757b1e0a2e9df3ea27e59257bc6a75 Mon Sep 17 00:00:00 2001 From: Jeremy Goecks Date: Thu, 30 May 2013 17:17:23 -0400 Subject: [PATCH] Enhance unicodify to correctly handle non-string input. --- lib/galaxy/util/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py index 14a07701800..52a5f1a443c 100644 --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -480,10 +480,11 @@ def unicodify( value, encoding=DEFAULT_ENCODING, error='replace', default=None ) """ Returns a unicode string or None """ + if isinstance( value, unicode ): return value try: - return unicode( value, encoding, error ) + return unicode( str( value ), encoding, error ) except: return default