From 569f90165351f69365e1fd74a068be0683b60f2e Mon Sep 17 00:00:00 2001 From: Croneter Date: Sat, 19 Dec 2020 21:11:19 +0100 Subject: [PATCH] Compatibility for Python 3 --- default.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/default.py b/default.py index b9f224a..d54b458 100644 --- a/default.py +++ b/default.py @@ -2,7 +2,6 @@ # We need this in order to use add-on paths like # 'plugin://plugin.video.plexkodiconnect.MOVIES' in the Kodi video database ############################################################################### -from __future__ import absolute_import, division, unicode_literals from logging import getLogger import sys import os @@ -14,12 +13,11 @@ # Import from the main pkc add-on __addon__ = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') -__temp_path__ = os.path.join(__addon__.getAddonInfo('path').decode('utf-8'), 'resources', 'lib') -__base__ = xbmc.translatePath(__temp_path__.encode('utf-8')).decode('utf-8') +__temp_path__ = os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib') +__base__ = xbmc.translatePath(__temp_path__.encode('utf-8')) sys.path.append(__base__) import transfer, loghandler -from tools import unicode_paths ############################################################################### loghandler.config() @@ -41,12 +39,12 @@ def play(): xbmcplugin.setResolvedUrl(HANDLE, False, xbmcgui.ListItem()) return else: - request = '%s&handle=%s' % (unicode_paths.decode(sys.argv[2]), HANDLE) - if b'resume:true' in sys.argv: + request = f'{sys.argv[2]}&handle={HANDLE}' + if 'resume:true' in sys.argv: request += '&resume=1' - elif b'resume:false' in sys.argv: + elif 'resume:false' in sys.argv: request += '&resume=0' - transfer.plex_command('PLAY-%s' % request) + transfer.plex_command(f'PLAY-{request}') if HANDLE == -1: # Handle -1 received, not waiting for main thread return