From 49d188e34398fe314d80afe93e39183e4514a9de Mon Sep 17 00:00:00 2001 From: Harshad Sharma Date: Fri, 16 Jun 2017 22:50:22 +0530 Subject: [PATCH] Failsafe defaults for imported env variables. --- src/qutescript/request.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/qutescript/request.py b/src/qutescript/request.py index cd56f5d..5b39cb0 100644 --- a/src/qutescript/request.py +++ b/src/qutescript/request.py @@ -54,21 +54,22 @@ class Request(object): def build_request(script_path): import os request = Request() - request.mode = os.getenv('QUTE_MODE') - request.user_agent = os.getenv('QUTE_USER_AGENT') - request.fifo = os.getenv('QUTE_FIFO') - request.html = os.getenv('QUTE_HTML') - request.text = os.getenv('QUTE_TEXT') - request.config_dir = os.getenv('QUTE_CONFIG_DIR') - request.data_dir = os.getenv('QUTE_DATA_DIR') - request.download_dir = os.getenv('QUTE_DOWNLOAD_DIR') - request.commandline_text = os.getenv('QUTE_COMMANDLINE_TEXT') - request.url = os.getenv('QUTE_URL') - request.title = os.getenv('QUTE_TITLE') + request.mode = os.getenv('QUTE_MODE', '') + request.user_agent = os.getenv('QUTE_USER_AGENT', '') + request.fifo = os.getenv('QUTE_FIFO', '') + request.html = os.getenv('QUTE_HTML', '') + request.text = os.getenv('QUTE_TEXT', '') + request.config_dir = os.getenv('QUTE_CONFIG_DIR', '') + request.data_dir = os.getenv('QUTE_DATA_DIR', '') + request.download_dir = os.getenv('QUTE_DOWNLOAD_DIR', '') + request.commandline_text = os.getenv('QUTE_COMMANDLINE_TEXT', '') + request.url = os.getenv('QUTE_URL', '') + request.title = os.getenv('QUTE_TITLE', '') + request.selected_text = os.getenv('QUTE_SELECTED_TEXT', '') + request.selected_html = os.getenv('QUTE_SELECTED_HTML', '') request.script_name = os.path.basename(script_path) request.script_path = os.path.basename(script_path) - request.selected_text = os.getenv('QUTE_SELECTED_TEXT') - request.selected_html = os.getenv('QUTE_SELECTED_HTML') + if not request.mode: raise AssertionError('Unable to read environment variables, did you pass `:spawn --userscript` ?') return request