More general changes, and get mobidedrm and kindlekey to work on Mac.

DeDRM_plugin/utilities.py

@@ -19,8 +19,8 @@ DETAILED_MESSAGE = \
 
 def uStrCmp (s1, s2, caseless=False):
     import unicodedata as ud
-    str1 = s1 if isinstance(s1, unicode) else s1.decode('utf-8')
-    str2 = s2 if isinstance(s2, unicode) else s2.decode('utf-8')
+    str1 = s1 if isinstance(s1, str) else str(s1)
+    str2 = s2 if isinstance(s2, str) else str(s2)
     if caseless:
         return ud.normalize('NFC', str1.lower()) == ud.normalize('NFC', str2.lower())
     else: