Fixing ruamel.yaml issues.

Author: krulis-martin

plagiarisms/config.py

@@ -1,6 +1,6 @@
 import os
 import glob
-from ruamel import yaml
+from ruamel.yaml import YAML
 
 
 def _find_file(file, fallback_wildcard):
@@ -33,7 +33,8 @@ def load_config(cfg_file):
     '''
     cfg_file = _find_file(cfg_file, './config.yaml')
     with open(cfg_file, "r", encoding="utf8") as fp:
-        config = yaml.safe_load(fp)
+        yaml = YAML(typ="safe")
+        config = yaml.load(fp)
 
     # fix relative paths
     base = os.path.dirname(cfg_file)

plagiarisms/downloader.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import csv
-from ruamel import yaml
+from ruamel.yaml import YAML
 import subprocess
 import logging
 
@@ -60,6 +60,7 @@ def _prepare_config(self):
         new_config['manifest']['solution_id'] = 'solution.id'
 
         with open(self._get_config_file(), 'w') as fp:
+            yaml = YAML(typ="safe")
             yaml.dump(new_config, fp)
 
     def _verify_download(self):