From 32536152850a683e18935eb5223a5bd1410e9258 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 15 Oct 2012 10:27:47 -0400
Subject: added support for JSON and YAML properties files

---
 src/lib/Bcfg2/Server/Plugins/Probes.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')

diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index c63f015e5..c2a928e0f 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -41,16 +41,10 @@ except ImportError:
         HAS_JSON = False
 
 try:
-    import syck as yaml
-    import syck.error as YAMLError
+    import yaml
     HAS_YAML = True
 except ImportError:
-    try:
-        import yaml
-        from yaml import YAMLError
-        HAS_YAML = True
-    except ImportError:
-        HAS_YAML = False
+    HAS_YAML = False
 
 
 class ClientProbeDataSet(dict):
@@ -110,7 +104,7 @@ class ProbeData(str):
         if self._yaml is None and HAS_YAML:
             try:
                 self._yaml = yaml.load(self.data)
-            except YAMLError:
+            except yaml.YAMLError:
                 pass
         return self._yaml
 
-- 
cgit v1.2.3-1-g7c22