2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/fa04c813f5c9/ Changeset: fa04c813f5c9 Branch: next-stable User: jgoecks Date: 2013-05-30 23:17:23 Summary: Enhance unicodify to correctly handle non-string input. Affected #: 1 file diff -r 69d502188765dacd378a5ac75b49d2b0a0b33032 -r fa04c813f5c9ddfaae1ed3e9896591128a07780d lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -480,10 +480,11 @@ """ 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 https://bitbucket.org/galaxy/galaxy-central/commits/460bdfc91d32/ Changeset: 460bdfc91d32 User: jgoecks Date: 2013-05-30 23:17:48 Summary: Automated merge with next-stable Affected #: 1 file diff -r babedb4715aaa3afeeebfe162f9e089625b1533a -r 460bdfc91d32cf6692ff3dc1837b2e3d981dd1a2 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -480,10 +480,11 @@ """ 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 Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.