Ported to Python 3

WILL NOT WORK COMPLETELY, YET

Author: pikim

addon.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.service.kodi.callbacks" name="Kodi Callbacks" version="1.0.0" provider-name="KenV99">
+<addon id="script.service.kodi.callbacks"
+       name="Kodi Callbacks"
+	   version="1.1.0"
+	   provider-name="KenV99">
   <requires>
-    <import addon="xbmc.python" version="2.20.0"/>
+    <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.requests" version="2.3.0"/>
+    <import addon="script.module.web-pdb" />
   </requires>
   <extension point="xbmc.service" library="default.py" start="startup">
   </extension>

default.py

@@ -106,7 +106,7 @@ def start():
     settings.getSettings()
     kl = KodiLogger()
     if settings.general['elevate_loglevel'] is True:
-        kl.setLogLevel(xbmc.LOGNOTICE)
+        kl.setLogLevel(xbmc.LOGINFO)
     else:
         kl.setLogLevel(xbmc.LOGDEBUG)
     log = kl.log
@@ -134,8 +134,8 @@ def start():
 
 
 def main():
-    msg = _(u'$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (%s:build %s) python: %s').encode('utf-8') % (str(_addonversion_), branch, build, sys.version)
-    xbmc.log(msg=msg, level=xbmc.LOGNOTICE)
+    msg = _(u'$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (%s:build %s) python: %s') % (str(_addonversion_), branch, build, sys.version)
+    xbmc.log(msg=msg, level=xbmc.LOGINFO)
     if branch != 'master':
         xbmcaddon.Addon().setSetting('installed branch', branch)
     start()
@@ -154,7 +154,7 @@ def main():
 if __name__ == '__main__':
 
     if testTasks:
-        KodiLogger.setLogLevel(KodiLogger.LOGNOTICE)
+        KodiLogger.setLogLevel(KodiLogger.LOGINFO)
         startdebugger()
         from resources.lib.tests.testTasks import testTasks
 

resources/lib/__init__.py

@@ -16,11 +16,12 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+
 import os
 import pkgutil
 import sys
 
-import tasks
+from resources.lib import tasks
 from resources.lib.kodilogging import KodiLogger
 from resources.lib.taskABC import AbstractTask
 from resources.lib.utils.kodipathtools import translatepath, setPathExecuteRW, setPathRW

resources/lib/dialogtb.py

@@ -63,7 +63,7 @@ def show_textbox(title, msg):
     _cwd_ = xbmc.translatePath(_addon_.getAddonInfo('path'))
     msgbox = MessageDialog(u"DialogTextBox.xml", _cwd_, u"Default")
     xt = type(msg)
-    if xt is str or xt is unicode:
+    if xt is str:
         wmsg = u'\n'.join(textwrap.wrap(msg, 62))
     elif xt is list:
         tmsg = []
@@ -80,4 +80,3 @@ def show_textbox(title, msg):
     msgbox.set_text(title, wmsg)
     msgbox.doModal()
     del msg
-

resources/lib/kodilogging.py

@@ -19,7 +19,7 @@
 import xbmc
 import threading
 
-def log(loglevel=xbmc.LOGNOTICE, msg=''):
+def log(loglevel=xbmc.LOGINFO, msg=''):
     if isinstance(msg, str):
         msg = msg.decode("utf-8")
     message = u"$$$ [%s] - %s" % ('kodi.callbacks', msg)
@@ -40,7 +40,7 @@ class KodiLogger(object):
     kodirunning = True
 
     def __new__(cls):
-        if xbmc.getFreeMem() == long():
+        if xbmc.getFreeMem() == int():
             KodiLogger.kodirunning = False
         if KodiLogger._instance is None:
             with KodiLogger._lock:
@@ -59,10 +59,9 @@ def setLogLevel(arg):
     def log(loglevel=None, msg=''):
         if loglevel is None:
             loglevel = KodiLogger.selfloglevel
-        if isinstance(msg, str):
-            msg = msg.decode("utf-8")
+        msg = str(msg)
         if KodiLogger.kodirunning:
             message = u"$$$ [%s] - %s" % (u'kodi.callbacks', msg)
-            xbmc.log(msg=message.encode("utf-8", 'replace'), level=loglevel)
+            xbmc.log(msg=message, level=loglevel)
         else:
-            print msg
+            print(msg)

resources/lib/kodisettings/generate_xml.py

@@ -70,7 +70,7 @@ def createTasks():
     tasks = []
     last_id = None
     taskcontrols = []
-    for i in xrange(1, 11):
+    for i in range(1, 11):
         tasks.append('Task %i' % i)
         prefix = "T%s" % str(i)
         curTaskType = '%s.type' % prefix
@@ -105,7 +105,7 @@ def createTasks():
                 try:
                     option = varset['option']
                 except KeyError:
-                    conditionals = struct.Conditional(struct.Conditional.OP_EQUAL, unicode(key), curTaskType)
+                    conditionals = struct.Conditional(struct.Conditional.OP_EQUAL, str(key), curTaskType)
                     if varset['type'] == 'sfile':
                         labelbrowse = u'%s - browse' % varset['label']
                         labeledit = u'%s - edit' % varset['label']
@@ -128,7 +128,7 @@ def createTasks():
                                     default=varset['default'],
                                     visible=conditionals))
                 else:
-                    conditionals = struct.Conditional(struct.Conditional.OP_EQUAL, unicode(key), curTaskType)
+                    conditionals = struct.Conditional(struct.Conditional.OP_EQUAL, str(key), curTaskType)
                     if varset['type'] == 'sfile':
                         labelbrowse = '%s - browse' % varset['label']
                         labeledit = '%s - edit' % varset['label']
@@ -163,7 +163,7 @@ def createEvents(tasks):
     eventcontrols = []
 
     last_id = None
-    for i in xrange(1, 11):
+    for i in range(1, 11):
         prefix = 'E%s' % str(i)
         curEvtType = '%s.type' % prefix
         action_evt = 'RunScript(script.service.kodi.callbacks, lselector, id=%s.type, heading=%s, lvalues=%s)' % (
@@ -250,7 +250,7 @@ def createEvents(tasks):
                     lines.append(vs[x+1:])
                     for line in lines:
                         eventcontrols.append(struct.Lsep(label=line, visible=conditionals))
-        conditionals = struct.Conditional(struct.Conditional.OP_NOT_EQUAL, unicode(glsid('None')), curEvtType)
+        conditionals = struct.Conditional(struct.Conditional.OP_NOT_EQUAL, str(glsid('None')), curEvtType)
         eventcontrols.append(
             struct.Text('%s.userargs' % prefix, 'Var subbed arg string', default='', visible=conditionals))
         eventcontrols.append(struct.Action('%s.test' % prefix, 'Test Command (click OK to save changes first)',