From 86a83c16b871f2a1b9c47854d3de39d6b1dc245b Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 16 Jul 2015 15:09:22 -0400 Subject: [PATCH] Remove some dead code from the base load_data method Was causing an odd error which threw off the error detection code when the datastructure was a string corresponding to a variable. --- lib/ansible/playbook/base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py index fe593c2a1d..d4da3dc004 100644 --- a/lib/ansible/playbook/base.py +++ b/lib/ansible/playbook/base.py @@ -154,8 +154,11 @@ class Base: else: self._loader = DataLoader() - if isinstance(ds, string_types) or isinstance(ds, FileIO): - ds = self._loader.load(ds) + # FIXME: is this required anymore? This doesn't seem to do anything + # helpful, and was added in very early stages of the base class + # development. + #if isinstance(ds, string_types) or isinstance(ds, FileIO): + # ds = self._loader.load(ds) # call the preprocess_data() function to massage the data into # something we can more easily parse, and then call the validation