summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Probes.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Probes.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 79f2ae87e..68cdce6e8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -7,7 +7,7 @@ import operator
import lxml.etree
import Bcfg2.Server
import Bcfg2.Server.Plugin
-from Bcfg2.Compat import any
+from Bcfg2.Compat import any, json
try:
from django.db import models
@@ -16,16 +16,6 @@ except ImportError:
has_django = False
try:
- import json
- has_json = True
-except ImportError:
- try:
- import simplejson as json
- has_json = True
- except ImportError:
- has_json = False
-
-try:
import syck as yaml
has_yaml = True
yaml_error = yaml.error
@@ -93,7 +83,7 @@ class ProbeData(str):
@property
def json(self):
- if self._json is None and has_json:
+ if self._json is None:
try:
self._json = json.loads(self.data)
except ValueError: