diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-24 13:25:01 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-25 11:58:48 -0400 |
| commit | 3428eab79ab21d1ecee6d2f8edff083a2cccdf79 (patch) | |
| tree | 9f19144fe7d5161c9208f50aa0b6a9945682a967 /src/lib/Bcfg2/Server/Plugins/Ohai.py | |
| parent | 6d4d8df68717780239fad273dd722359db10e64b (diff) | |
| download | bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.tar.gz bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.tar.bz2 bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.zip | |
made json optional again
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ohai.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ohai.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py index 35e385a77..052597f84 100644 --- a/src/lib/Bcfg2/Server/Plugins/Ohai.py +++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py @@ -2,7 +2,13 @@ import lxml.etree import os import logging import Bcfg2.Server.Plugin -from Bcfg2.Compat import json + +# pylint: disable=F0401 +try: + import json +except ImportError: + import simplejson as json +# pylint: enable=F0401 logger = logging.getLogger('Bcfg2.Plugins.Ohai') @@ -19,6 +25,7 @@ else fi """ + class OhaiCache(object): def __init__(self, dirname): self.dirname = dirname |