archangelic
/
pinhook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct UnboundLocalError in read_conf (#76) 

When encountering an error, read_conf uses click.echo(...) to emit an
error message but then continue execution, causing the read_conf
method to throw an error of the form:

    UnboundLocalError: local variable 'output' referenced before assignment

By raising click.ClickException instead of calling click.echo, we
ensure that pinhook exits with an error message (and no traceback).
master
Lars Kellogg-Stedman 2020-11-12 11:10:31 -05:00 committed by GitHub
parent 7c62e59c3a
commit 35f5bb684b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pinhook/cli.py
View File

@ -27,7 +27,7 @@ def read_conf(config, conf_format):
elif config.name.endswith(('.toml', '.tml')): elif config.name.endswith(('.toml', '.tml')):
conf_format = 'toml' conf_format = 'toml'
else: else:
click.echo('Could not detect file format, please supply using --format option', err=True) raise click.ClickException('Could not detect file format, please supply using --format option')
if conf_format == 'json': if conf_format == 'json':
import json import json
to_json = json.loads(config.read()) to_json = json.loads(config.read())
@ -36,7 +36,7 @@ def read_conf(config, conf_format):
try: try:
import yaml import yaml
except ImportError: except ImportError:
click.echo('yaml not installed, please use `pip3 install pinhook[yaml]` to install', err=True) raise click.ClickException('yaml not installed, please use `pip3 install pinhook[yaml]` to install')
else: else:
to_yaml = yaml.load(config.read(), Loader=yaml.FullLoader) to_yaml = yaml.load(config.read(), Loader=yaml.FullLoader)
output = schema.load(to_yaml) output = schema.load(to_yaml)
@ -44,7 +44,7 @@ def read_conf(config, conf_format):
try: try:
import toml import toml
except ImportError: except ImportError:
click.echo('toml not installed, please use `pip3 install pinhook[toml]` to install', err=True) raise click.ClicKException('toml not installed, please use `pip3 install pinhook[toml]` to install')
else: else:
to_toml = toml.load(config.name) to_toml = toml.load(config.name)
output = schema.load(to_toml) output = schema.load(to_toml)