diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-17 10:31:16 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 11:37:55 -0400 |
| commit | af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 (patch) | |
| tree | 47a532ae4d72eef2068a1bf8260eafabeafdef2e /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | 3ea977825739b1c15c04ca053cc44bcfacf9cfb9 (diff) | |
| download | bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.gz bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.bz2 bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.zip | |
added json, md5 to Bcfg2.Compat
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 14 |
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: |