From ccc5b096d06a94fc5dee3b680ee39742fab13bb0 Mon Sep 17 00:00:00 2001 From: heitbaum <6086324+heitbaum@users.noreply.github.com> Date: Sun, 18 Oct 2020 16:42:35 +1100 Subject: [PATCH 1/2] [python] update xbmc.translatePath() to xbmcvfs xbmc.translatePath is deprecated and might be removed in future kodi versions. Please use xbmcvfs.translatePath instead. The reference if from: xbmc/xbmc#17735 --- packages/addons/service/tvheadend42/source/download.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/service/tvheadend42/source/download.py b/packages/addons/service/tvheadend42/source/download.py index d616fdf788..ecfb8b6139 100644 --- a/packages/addons/service/tvheadend42/source/download.py +++ b/packages/addons/service/tvheadend42/source/download.py @@ -3,14 +3,14 @@ import urllib, os, zipfile from urllib2 import URLError -import xbmc, xbmcgui, xbmcaddon +import xbmc, xbmcvfs, xbmcgui, xbmcaddon import shutil import sys url = 'https://github.com/tvheadend/dtv-scan-tables/archive/tvheadend.zip' -temp = xbmc.translatePath('special://temp') +temp = xbmcvfs.translatePath('special://temp') temp_folder = os.path.join(temp, 'dtv-scan-tables-tvheadend') -dest_folder = os.path.join(xbmc.translatePath(xbmcaddon.Addon().getAddonInfo('path')), 'dvb-scan') +dest_folder = os.path.join(xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo('path')), 'dvb-scan') archive = os.path.join(temp, 'dtv_scantables.zip') ADDON_NAME = xbmcaddon.Addon().getAddonInfo('name') From 5c2cb2022d3adc3dd70ab2fa201f4e597981208f Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 22 Nov 2020 15:20:55 +1100 Subject: [PATCH 2/2] Tvheadend 42: python: update to python3 - urllib Automated Python 2 to 3 code translation 2to3 packages/addons/service/tvheadend42/source/download.py http://ix.io/2F2a --- packages/addons/service/tvheadend42/source/download.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/addons/service/tvheadend42/source/download.py b/packages/addons/service/tvheadend42/source/download.py index ecfb8b6139..eb672e0740 100644 --- a/packages/addons/service/tvheadend42/source/download.py +++ b/packages/addons/service/tvheadend42/source/download.py @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) -import urllib, os, zipfile -from urllib2 import URLError +import urllib.request, urllib.parse, urllib.error, os, zipfile +from urllib.error import URLError import xbmc, xbmcvfs, xbmcgui, xbmcaddon import shutil import sys @@ -25,7 +25,7 @@ class DownLoader(): def download(self, url, dest): try: self.dp.create(ADDON_NAME, LS(30042)) - urllib.urlretrieve(url, dest, reporthook=self._pbhook) + urllib.request.urlretrieve(url, dest, reporthook=self._pbhook) self.dp.close() zip = zipfile.ZipFile(archive) if zip.testzip() is not None: raise zipfile.BadZipfile @@ -44,7 +44,7 @@ class DownLoader(): shutil.copytree(os.path.join(temp_folder, folder), os.path.join(dest_folder, folder)) xbmcgui.Dialog().notification(ADDON_NAME, LS(30039), xbmcgui.NOTIFICATION_INFO) - except URLError, e: + except URLError as e: xbmc.log('Could not download file: %s' % e.reason, xbmc.LOGERROR) self.dp.close() xbmcgui.Dialog().notification(ADDON_NAME, LS(30040), xbmcgui.NOTIFICATION_ERROR)