From 44808f5dd4827e6b5401ebfdd1d8f2825cb65ca8 Mon Sep 17 00:00:00 2001
From: Matt <mcarlton00@gmail.com>
Date: Thu, 19 Mar 2020 09:37:47 -0400
Subject: [PATCH 1/3] Fix ascii error on context menu
---
jellyfin_kodi/dialogs/context.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jellyfin_kodi/dialogs/context.py b/jellyfin_kodi/dialogs/context.py
index 454f9275..be40c5ab 100644
--- a/jellyfin_kodi/dialogs/context.py
+++ b/jellyfin_kodi/dialogs/context.py
@@ -64,7 +64,7 @@ class ContextMenu(xbmcgui.WindowXMLDialog):
if self.getFocusId() == LIST:
option = self.list_.getSelectedItem()
- self.selected_option = option.getLabel()
+ self.selected_option = option.getLabel().decode('utf-8')
LOG.info('option selected: %s', self.selected_option)
self.close()
From 6e786a1e6bf212835059723562fd77bc073bc861 Mon Sep 17 00:00:00 2001
From: Matt <mcarlton00@gmail.com>
Date: Thu, 19 Mar 2020 12:37:50 -0400
Subject: [PATCH 2/3] Use six to get correct string format
---
addon.xml | 2 +-
jellyfin_kodi/dialogs/context.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/addon.xml b/addon.xml
index 46fd6c61..6b2350f5 100644
--- a/addon.xml
+++ b/addon.xml
@@ -7,7 +7,7 @@
<import addon="xbmc.python" version="2.25.0"/>
<import addon="script.module.requests" version="2.22.0"/>
<import addon="script.module.dateutil" version="2.7.3"/>
- <import addon="script.module.six" />
+ <import addon="script.module.six" version="1.13"/>
<import addon="script.module.kodi-six" />
<import addon="script.module.addon.signals" version="0.0.1"/>
<import addon="script.module.futures" version="2.2.0"/>
diff --git a/jellyfin_kodi/dialogs/context.py b/jellyfin_kodi/dialogs/context.py
index be40c5ab..de66ba49 100644
--- a/jellyfin_kodi/dialogs/context.py
+++ b/jellyfin_kodi/dialogs/context.py
@@ -7,6 +7,7 @@ import logging
import os
from kodi_six import xbmcgui, xbmcaddon
+from six import ensure_text
from helper import window, addon_id
@@ -64,7 +65,7 @@ class ContextMenu(xbmcgui.WindowXMLDialog):
if self.getFocusId() == LIST:
option = self.list_.getSelectedItem()
- self.selected_option = option.getLabel().decode('utf-8')
+ self.selected_option = ensure_text(option.getLabel())
LOG.info('option selected: %s', self.selected_option)
self.close()
From fd2f25c61e04706e61cb73ef4867a461a7cce360 Mon Sep 17 00:00:00 2001
From: Matt <mcarlton00@gmail.com>
Date: Sat, 21 Mar 2020 13:19:13 -0400
Subject: [PATCH 3/3] Make dependency version 3 digits
---
addon.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon.xml b/addon.xml
index 6b2350f5..d1f566fc 100644
--- a/addon.xml
+++ b/addon.xml
@@ -7,7 +7,7 @@
<import addon="xbmc.python" version="2.25.0"/>
<import addon="script.module.requests" version="2.22.0"/>
<import addon="script.module.dateutil" version="2.7.3"/>
- <import addon="script.module.six" version="1.13"/>
+ <import addon="script.module.six" version="1.13.0"/>
<import addon="script.module.kodi-six" />
<import addon="script.module.addon.signals" version="0.0.1"/>
<import addon="script.module.futures" version="2.2.0"/>