Merge pull request #55 from chjohnst/master

python 2.5 dep

2 files changed, 10 insertions, 2 deletions

diff --git a/bin/ansible b/bin/ansible
index 1591e28b63..909e62b40b 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -17,9 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
 from optparse import OptionParser
 import sys
-import json
 import os
 import getpass
 import shlex
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index aad7553259..8a343a37d6 100755
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -16,11 +16,15 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
 import fnmatch
 import multiprocessing
 import signal
 import os
-import json
 import traceback
 import paramiko # non-core dependency
 import ansible.constants as C