Skip to content

Commit

Permalink
Merge pull request #25 from freedomofpress/pyyaml-followup
Browse files Browse the repository at this point in the history
followup from pyyaml update
  • Loading branch information
redshiftzero authored Apr 17, 2019
2 parents a78da7e + 5f092fb commit 656bbb2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion securedrop_proxy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def read_conf(conf_path, p):

try:
fh = open(conf_path, 'r')
conf_in = yaml.load(fh)
conf_in = yaml.safe_load(fh)
except yaml.YAMLError:
p.simple_error(500, 'YAML syntax error while reading configuration file {}'.format(conf_path))
p.on_done(p.res)
Expand Down

0 comments on commit 656bbb2

Please sign in to comment.