Merge pull request #347 from bocoup/all-monkey-all-the-time

Use "monkeyYaml" in all environments
2015-07-06 16:51:00 -05:00 · 2015-07-06 16:51:00 -05:00 · 26faeed5c7
parent c6ac390868 1303ef0d05
commit 26faeed5c7
1 changed files with 2 additions and 6 deletions
--- a/tools/packaging/parseTestRecord.py
+++ b/tools/packaging/parseTestRecord.py
@ -113,12 +113,8 @@ def importYamlLoad():
    global yamlLoad
    if yamlLoad:
        return
-    try:
-        import yaml
-        yamlLoad = yaml.load
-    except:
-        monkeyYaml = loadMonkeyYaml()
-        yamlLoad = monkeyYaml.load
+    monkeyYaml = loadMonkeyYaml()
+    yamlLoad = monkeyYaml.load

 def loadMonkeyYaml():
    f = None