jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 07:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tvheadend 42: python: update to python3 - urllib

Browse Source 
Automated Python 2 to 3 code translation
2to3 packages/addons/service/tvheadend42/source/download.py
http://ix.io/2F2a
This commit is contained in:
heitbaum 2020-11-22 15:20:55 +11:00 committed by GitHub
parent ccc5b096d0
commit 5c2cb2022d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/addons/service/tvheadend42/source/download.py
View File

@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
import urllib, os, zipfile import urllib.request, urllib.parse, urllib.error, os, zipfile
from urllib2 import URLError from urllib.error import URLError
import xbmc, xbmcvfs, xbmcgui, xbmcaddon import xbmc, xbmcvfs, xbmcgui, xbmcaddon
import shutil import shutil
import sys import sys
@ -25,7 +25,7 @@ class DownLoader():
def download(self, url, dest): def download(self, url, dest):
try: try:
self.dp.create(ADDON_NAME, LS(30042)) 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() self.dp.close()
zip = zipfile.ZipFile(archive) zip = zipfile.ZipFile(archive)
if zip.testzip() is not None: raise zipfile.BadZipfile 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)) shutil.copytree(os.path.join(temp_folder, folder), os.path.join(dest_folder, folder))
xbmcgui.Dialog().notification(ADDON_NAME, LS(30039), xbmcgui.NOTIFICATION_INFO) 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) xbmc.log('Could not download file: %s' % e.reason, xbmc.LOGERROR)
self.dp.close() self.dp.close()
xbmcgui.Dialog().notification(ADDON_NAME, LS(30040), xbmcgui.NOTIFICATION_ERROR) xbmcgui.Dialog().notification(ADDON_NAME, LS(30040), xbmcgui.NOTIFICATION_ERROR)