Skip to content

Commit

Permalink
Merge branch '1.0.x' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
remram44 committed Jun 27, 2018
2 parents 1b16d41 + 4bc260e commit ee4d4bf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ env:
- TEST_MODE=run_program
python:
- "2.7"
- "3.3"
- "3.4"
- "3.6"
install: .travis/install.sh
Expand Down
2 changes: 1 addition & 1 deletion reprounzip-qt/reprounzip_qt/gui/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def _directory_changed(self, new_dir=None, force=False):
self.runs_widget.clear()
if unpacker is not None:
with open(self.directory + '/config.yml') as fp:
self.config = yaml.load(fp)
self.config = yaml.safe_load(fp)
self.run_widget.setEnabled(True)
self.destroy_widget.setEnabled(True)
self.files_button.setEnabled(True)
Expand Down

0 comments on commit ee4d4bf

Please sign in to comment.