summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Ohai.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-01-30 07:30:18 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-01-30 07:30:18 -0500
commit8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4 (patch)
treef702c14114347966d0ff1d2bd15e494f3fa62015 /src/lib/Bcfg2/Server/Plugins/Ohai.py
parent9be8b7fb9eef3aa9cc7d44adb565dad7625ede4f (diff)
downloadbcfg2-8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4.tar.gz
bcfg2-8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4.tar.bz2
bcfg2-8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4.zip
fixed pylint tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ohai.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Ohai.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py
index f5bde1820..0853ea993 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -10,7 +10,8 @@ import Bcfg2.Server.Plugin
try:
import json
- json.loads # py2.4 json library is structured differently
+ # py2.4 json library is structured differently
+ json.loads # pylint: disable=W0104
except (ImportError, AttributeError):
import simplejson as json