Return unicode

1 files changed, 6 insertions, 1 deletions

diff --git a/ldtpd/combo_box.py b/ldtpd/combo_box.py
index a89cfac..5bcba60 100644
--- a/ldtpd/combo_box.py
+++ b/ldtpd/combo_box.py
@@ -675,4 +675,9 @@ class ComboBox(Utils, LayeredPane):
         if not _ldtpize_accessible_name[1] and not _ldtpize_accessible_name[2]:
             raise LdtpServerException("Unable to get currently selected item")
         # Return label by value, which is actually selected one
-        return _ldtpize_accessible_name[2] or _ldtpize_accessible_name[1]
+        # Preference to label_by rather than label
+        text=_ldtpize_accessible_name[2] or _ldtpize_accessible_name[1]
+        try:
+            return unicode(text)
+        except UnicodeDecodeError:
+            return text