From 3aa912ca4cdb7ecbca13fccbd68fac1fe73a1a65 Mon Sep 17 00:00:00 2001
From: Rob Weber <rweber@ecec.com>
Date: Fri, 22 Nov 2019 14:53:20 -0600
Subject: [PATCH] remove kodi-six, use python3 kodi libs

---
 default.py                       | 2 +-
 launcher.py                      | 2 +-
 resources/lib/advanced_editor.py | 2 +-
 resources/lib/authorizers.py     | 2 +-
 resources/lib/backup.py          | 3 +--
 resources/lib/guisettings.py     | 2 +-
 resources/lib/progressbar.py     | 2 +-
 resources/lib/utils.py           | 2 +-
 resources/lib/vfs.py             | 6 +++---
 scheduler.py                     | 2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/default.py b/default.py
index aa50409..54c9d61 100644
--- a/default.py
+++ b/default.py
@@ -1,5 +1,5 @@
 import sys
-from kodi_six import xbmc, xbmcgui
+import xbmc, xbmcgui
 import resources.lib.utils as utils
 from resources.lib.backup import XbmcBackup
 
diff --git a/launcher.py b/launcher.py
index 5db2126..54f09a4 100644
--- a/launcher.py
+++ b/launcher.py
@@ -1,5 +1,5 @@
 import sys
-from kodi_six import xbmc, xbmcgui, xbmcvfs
+import xbmc, xbmcgui, xbmcvfs
 import resources.lib.utils as utils
 from resources.lib.authorizers import DropboxAuthorizer
 from resources.lib.advanced_editor import AdvancedBackupEditor
diff --git a/resources/lib/advanced_editor.py b/resources/lib/advanced_editor.py
index 2c21779..1aa1fda 100644
--- a/resources/lib/advanced_editor.py
+++ b/resources/lib/advanced_editor.py
@@ -1,5 +1,5 @@
 import json
-from kodi_six import xbmc, xbmcgui, xbmcvfs
+import xbmc, xbmcgui, xbmcvfs
 from . import utils as utils
 
 class BackupSetManager:
diff --git a/resources/lib/authorizers.py b/resources/lib/authorizers.py
index cb83640..f870aee 100644
--- a/resources/lib/authorizers.py
+++ b/resources/lib/authorizers.py
@@ -1,4 +1,4 @@
-from kodi_six import xbmc, xbmcgui, xbmcvfs
+import xbmc, xbmcgui, xbmcvfs
 import resources.lib.tinyurl as tinyurl
 import resources.lib.utils as utils
 
diff --git a/resources/lib/backup.py b/resources/lib/backup.py
index 2ba9755..3e6a89c 100644
--- a/resources/lib/backup.py
+++ b/resources/lib/backup.py
@@ -1,9 +1,8 @@
 from __future__ import unicode_literals
 import time
 import json
-from kodi_six import xbmc, xbmcgui, xbmcvfs
+import xbmc, xbmcgui, xbmcvfs
 from . import utils as utils
-import os
 from datetime import datetime
 from . vfs import XBMCFileSystem,DropboxFileSystem,ZipFileSystem
 from . progressbar import BackupProgressBar
diff --git a/resources/lib/guisettings.py b/resources/lib/guisettings.py
index 9430ae7..d51ac6e 100644
--- a/resources/lib/guisettings.py
+++ b/resources/lib/guisettings.py
@@ -1,5 +1,5 @@
 import json
-from kodi_six import xbmc, xbmcvfs
+import xbmc, xbmcvfs
 from . import utils as utils
 from xml.dom import minidom
 from xml.parsers.expat import ExpatError
diff --git a/resources/lib/progressbar.py b/resources/lib/progressbar.py
index c84dfbf..e68cb04 100644
--- a/resources/lib/progressbar.py
+++ b/resources/lib/progressbar.py
@@ -1,4 +1,4 @@
-from kodi_six import xbmcgui
+import xbmcgui
 from . import utils as utils
 
 class BackupProgressBar:
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 6f28cca..f8a5e90 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -1,4 +1,4 @@
-from kodi_six import xbmc, xbmcgui, xbmcaddon
+import xbmc, xbmcgui, xbmcaddon
 
 __addon_id__= 'script.xbmcbackup'
 __Addon = xbmcaddon.Addon(__addon_id__)
diff --git a/resources/lib/vfs.py b/resources/lib/vfs.py
index 5d56307..47b6c7a 100644
--- a/resources/lib/vfs.py
+++ b/resources/lib/vfs.py
@@ -2,10 +2,10 @@ from __future__ import unicode_literals
 import zipfile
 import os.path
 import sys
-from kodi_six import xbmc, xbmcvfs, xbmcgui
-import dropbox
+import xbmc, xbmcvfs, xbmcgui
+from . import dropbox
 from . import utils as utils
-from dropbox.files import WriteMode,CommitInfo,UploadSessionCursor
+from .dropbox.files import WriteMode,CommitInfo,UploadSessionCursor
 from . authorizers import DropboxAuthorizer
 
 class Vfs:
diff --git a/scheduler.py b/scheduler.py
index 32ba566..cd8a182 100644
--- a/scheduler.py
+++ b/scheduler.py
@@ -1,6 +1,6 @@
 import time
 from datetime import datetime
-from kodi_six import xbmc, xbmcvfs, xbmcgui
+import xbmc, xbmcvfs, xbmcgui
 import resources.lib.utils as utils
 from resources.lib.croniter import croniter
 from resources.lib.backup import XbmcBackup