diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-01-29 07:43:06 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-01-29 16:34:18 -0500 |
| commit | 2defc9cf5155f21a988855c31049fad3e40ecdd1 (patch) | |
| tree | f84db01dae7eb23a8d34a4022a80e00f39b104d7 /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | 79f5fce2a387f5dfc13e10146b36cb620a5bf166 (diff) | |
| download | bcfg2-2defc9cf5155f21a988855c31049fad3e40ecdd1.tar.gz bcfg2-2defc9cf5155f21a988855c31049fad3e40ecdd1.tar.bz2 bcfg2-2defc9cf5155f21a988855c31049fad3e40ecdd1.zip | |
load correct JSON library on py2.4
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index fdc047283..471ebfdaf 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -34,8 +34,9 @@ except ImportError: try: import json + json.loads # py2.4 json library is structured differently HAS_JSON = True -except ImportError: +except (ImportError, AttributeError): try: import simplejson as json HAS_JSON = True |