Revision: 3571
Author: jussi.ao.malinen
Date: Thu May 27 03:10:51 2010
Log: fixed unicode handling for java 1.5 + jython combination.
(Normalization is not done in that environment)
http://code.google.com/p/robotframework/source/detail?r=3571
Modified:
/trunk/src/robot/utils/unic.py
=======================================
--- /trunk/src/robot/utils/unic.py Wed May 5 04:39:32 2010
+++ /trunk/src/robot/utils/unic.py Thu May 27 03:10:51 2010
@@ -19,7 +19,11 @@
def unic(item, *args):
# Based on a recipe from http://code.activestate.com/recipes/466341
try:
- return unicodedata.normalize('NFC', unicode(item, *args))
+ # in jython with java 1.5 unicodedata does not have the
normalize-method
+ if hasattr(unicodedata, 'normalize'):
+ return unicodedata.normalize('NFC', unicode(item, *args))
+ else:
+ return unicode(item, *args)
except UnicodeError:
try:
ascii_text = str(item).encode('string_escape')
