diff options
Diffstat (limited to 'addons/service.xbmc.versioncheck/lib/jsoninterface.py')
| -rw-r--r-- | addons/service.xbmc.versioncheck/lib/jsoninterface.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/addons/service.xbmc.versioncheck/lib/jsoninterface.py b/addons/service.xbmc.versioncheck/lib/jsoninterface.py index 32395e890b..6f0f7acb91 100644 --- a/addons/service.xbmc.versioncheck/lib/jsoninterface.py +++ b/addons/service.xbmc.versioncheck/lib/jsoninterface.py @@ -31,13 +31,16 @@ import json as jsoninterface def get_installedversion(): # retrieve current installed version json_query = xbmc.executeJSONRPC('{ "jsonrpc": "2.0", "method": "Application.GetProperties", "params": {"properties": ["version", "name"]}, "id": 1 }') - json_query = unicode(json_query, 'utf-8', errors='ignore') + if sys.version_info[0] >= 3: + json_query = str(json_query) + else: + json_query = unicode(json_query, 'utf-8', errors='ignore') json_query = jsoninterface.loads(json_query) version_installed = [] - if json_query.has_key('result') and json_query['result'].has_key('version'): + if 'result' in json_query and 'version' in json_query['result']: version_installed = json_query['result']['version'] return version_installed - + def get_versionfilelist(): # retrieve versionlists from supplied version file version_file = os.path.join(ADDONPATH, 'resources/versions.txt') @@ -48,6 +51,9 @@ def get_versionfilelist(): file = xbmcvfs.File(version_file) data = file.read() file.close() - version_query = unicode(data, 'utf-8', errors='ignore') + if sys.version_info[0] >= 3: + version_query = str(data) + else: + version_query = unicode(data, 'utf-8', errors='ignore') version_query = jsoninterface.loads(version_query) return version_query |