Merge pull request #62 from danieladov/master

Change unicode to str

resources/lib/downloadutils.py

@@ -14,6 +14,7 @@ from base64 import b64encode
 from collections import defaultdict
 from traceback import format_exc
 from kodi_six.utils import py2_decode
+from six import ensure_text
 
 from .kodi_utils import HomeWindow
 from .clientinfo import ClientInformation
@@ -493,7 +494,7 @@ class DownloadUtils:
 
         secure = False
         for user in result:
-            if user.get("Name") == unicode(user_name, "utf-8"):
+            if user.get("Name") == ensure_text(user_name, "utf-8"):
                 userid = user.get("Id")
                 user_image = self.get_user_artwork(user, 'Primary')
                 log.debug("Username Found: {0}".format(user.get("Name")))

resources/lib/item_functions.py

@@ -16,6 +16,7 @@ from .utils import get_art, datetime_from_string
 from .loghandler import LazyLogger
 from .downloadutils import DownloadUtils
 from .kodi_utils import HomeWindow
+from six import ensure_text
 
 log = LazyLogger(__name__)
 kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2])
@@ -178,7 +179,7 @@ def extract_item_info(item, gui_options):
         name_info["SeasonIndex"] = u"%02d" % item_details.season_number
         name_info["EpisodeIndex"] = u"%02d" % item_details.episode_number
         log.debug("FormatName: {0} | {1}".format(name_format, name_info))
-        item_details.name = unicode(name_format).format(**name_info).strip()
+        item_details.name = ensure_text(name_format).format(**name_info).strip()
 
     year = item.get("ProductionYear")
     prem_date = item.get("PremiereDate")