Tweak misc.to_unicode() so that it is more likely to encode to utf-8 correctly.

wicd/misc.py

@@ -302,13 +302,22 @@ def get_gettext():
 def to_unicode(x):
     """ Attempts to convert a string to utf-8. """
     # If this is a unicode string, encode it and return
-    if type(x) == unicode:
+    if type(x) not in [unicode, str]:
+        return x
+    if isinstance(x, unicode):
         return x.encode('utf-8')
     encoding = locale.getpreferredencoding()
     try:
-        ret = x.decode(encoding, 'replace').encode('utf-8')
+        ret = x.decode(encoding).encode('utf-8')
-    except:
+    except UnicodeError:
+        try:
+            ret = x.decode('utf-8').encode('utf-8')
+        except UnicodeError:
+            try:
+                ret = x.decode('latin-1').encode('utf-8')
+            except UnicodeError:
                 ret = x.decode('utf-8', 'replace').encode('utf-8')
+            
     return ret
     
 def RenameProcess(new_name):