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

Use "monkeyYaml" in all environments
This commit is contained in:
Brian Terlson 2015-07-06 16:51:00 -05:00
commit 26faeed5c7

View File

@ -113,12 +113,8 @@ def importYamlLoad():
global yamlLoad global yamlLoad
if yamlLoad: if yamlLoad:
return return
try: monkeyYaml = loadMonkeyYaml()
import yaml yamlLoad = monkeyYaml.load
yamlLoad = yaml.load
except:
monkeyYaml = loadMonkeyYaml()
yamlLoad = monkeyYaml.load
def loadMonkeyYaml(): def loadMonkeyYaml():
f = None f = None