summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Probes.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Server/Plugins/Probes.py')
-rw-r--r--src/lib/Server/Plugins/Probes.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/Server/Plugins/Probes.py b/src/lib/Server/Plugins/Probes.py
index b07c4dfd3..ec0f294dd 100644
--- a/src/lib/Server/Plugins/Probes.py
+++ b/src/lib/Server/Plugins/Probes.py
@@ -6,19 +6,22 @@ try:
import json
has_json = True
except ImportError:
- has_json = False
+ try:
+ import simplejson as json
+ has_json = True
+ except ImportError:
+ has_json = False
try:
import syck
has_syck = True
except ImportError:
has_syck = False
-
-try:
- import yaml
- has_yaml = True
-except ImportError:
- has_yaml = False
+ try:
+ import yaml
+ has_yaml = True
+ except ImportError:
+ has_yaml = False
import Bcfg2.Server.Plugin