raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A little cleanup

This commit is contained in:
Raoul Snyman 2017-09-19 21:36:59 -07:00
parent 15c8023357
commit 99b7239bc0
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/plugins/bibles/lib/importers/http.py
View File

@ -289,11 +289,6 @@ class BGExtract(RegistryProperties):
if not page_source: if not page_source:
send_error_message('download') send_error_message('download')
return None return None
# TODO: Is this even necessary anymore?
# try:
# page_source = str(page_source, 'utf8')
# except UnicodeDecodeError:
# page_source = str(page_source, 'cp1251')
try: try:
soup = BeautifulSoup(page_source, 'lxml') soup = BeautifulSoup(page_source, 'lxml')
except Exception: except Exception:

14
openlp/plugins/remotes/deploy.py
View File

@ -19,10 +19,11 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
"""
Download and "install" the remote web client
"""
import os import os
import zipfile from zipfile import ZipFile
import urllib.error
from openlp.core.common import AppLocation, Registry from openlp.core.common import AppLocation, Registry
from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size
@ -38,7 +39,7 @@ def deploy_zipfile(app_root, zip_name):
:return: None :return: None
""" """
zip_file = os.path.join(app_root, zip_name) zip_file = os.path.join(app_root, zip_name)
web_zip = zipfile.ZipFile(zip_file) web_zip = ZipFile(zip_file)
web_zip.extractall(app_root) web_zip.extractall(app_root)
@ -48,9 +49,8 @@ def download_sha256():
""" """
user_agent = 'OpenLP/' + Registry().get('application').applicationVersion() user_agent = 'OpenLP/' + Registry().get('application').applicationVersion()
try: try:
web_config = get_web_page('{host}{name}'.format(host='https://get.openlp.org/webclient/', name='download.cfg'), web_config = get_web_page('https://get.openlp.org/webclient/download.cfg', headers={'User-Agent': user_agent})
headers={'User-Agent': user_agent}) except ConnectionError:
except (urllib.error.URLError, ConnectionError) as err:
return False return False
file_bits = web_config.split() file_bits = web_config.split()
return file_bits[0], file_bits[2] return file_bits[0], file_bits[2]